-
Notifications
You must be signed in to change notification settings - Fork 47
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* feat: migration to KTS * feat: adjusted dependencies * feat: removed Plugins * feat: added lint report * feat: copyright note * feat: removed unnused extras * feat: more updates * feat: Kotlin 2.0.21
- Loading branch information
Showing
17 changed files
with
391 additions
and
324 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
# Copyright 2024 Google LLC | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
name: Lint and Upload SARIF | ||
|
||
on: | ||
push: | ||
branches: | ||
- main | ||
pull_request: | ||
branches: | ||
- main | ||
|
||
jobs: | ||
lint: | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout code | ||
uses: actions/checkout@v3 | ||
|
||
- name: Set up JDK 17 | ||
uses: actions/[email protected] | ||
with: | ||
distribution: 'adopt' | ||
java-version: '17' | ||
|
||
- name: Run Android Lint | ||
run: ./gradlew lint | ||
|
||
- name: Merge SARIF files | ||
run: | | ||
jq -s '{ "$schema": "https://json.schemastore.org/sarif-2.1.0", "version": "2.1.0", "runs": map(.runs) | add }' maps-ktx/build/reports/lint-results.sarif maps-utils-ktx/build/reports/lint-results.sarif app/build/reports/lint-results.sarif > merged.sarif | ||
- name: Upload SARIF file | ||
uses: github/codeql-action/upload-sarif@v3 | ||
with: | ||
sarif_file: merged.sarif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
plugins { | ||
`kotlin-dsl` | ||
} | ||
|
||
repositories { | ||
google() | ||
mavenCentral() | ||
gradlePluginPortal() | ||
} | ||
|
||
|
||
dependencies { | ||
implementation(libs.kotlinGradlePlugin) | ||
implementation(libs.gradle) | ||
implementation(libs.dokkaGradlePlugin) | ||
implementation(libs.org.jacoco.core) | ||
} | ||
|
||
gradlePlugin { | ||
plugins { | ||
register("publishingConventionPlugin") { | ||
id = "android.maps.ktx.PublishingConventionPlugin" | ||
implementationClass = "PublishingConventionPlugin" | ||
} | ||
} | ||
} |
108 changes: 108 additions & 0 deletions
108
build-logic/convention/src/main/kotlin/PublishingConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,108 @@ | ||
// buildSrc/src/main/kotlin/PublishingConventionPlugin.kt | ||
import org.gradle.api.Plugin | ||
import org.gradle.api.Project | ||
import org.gradle.api.publish.PublishingExtension | ||
import org.gradle.api.publish.maven.MavenPublication | ||
import org.gradle.kotlin.dsl.* | ||
import org.gradle.testing.jacoco.plugins.JacocoPluginExtension | ||
import org.gradle.api.tasks.testing.Test | ||
import org.gradle.testing.jacoco.plugins.JacocoTaskExtension | ||
import org.gradle.plugins.signing.SigningExtension | ||
import org.gradle.api.publish.maven.* | ||
|
||
class PublishingConventionPlugin : Plugin<Project> { | ||
override fun apply(project: Project) { | ||
project.run { | ||
|
||
applyPlugins() | ||
configureJacoco() | ||
configurePublishing() | ||
configureSigning() | ||
} | ||
} | ||
|
||
private fun Project.applyPlugins() { | ||
apply(plugin = "com.android.library") | ||
apply(plugin = "com.mxalbert.gradle.jacoco-android") | ||
apply(plugin = "maven-publish") | ||
apply(plugin = "org.jetbrains.dokka") | ||
apply(plugin = "signing") | ||
} | ||
|
||
private fun Project.configureJacoco() { | ||
configure<JacocoPluginExtension> { | ||
toolVersion = "0.8.7" | ||
|
||
} | ||
|
||
tasks.withType<Test>().configureEach { | ||
extensions.configure(JacocoTaskExtension::class.java) { | ||
isIncludeNoLocationClasses = true | ||
excludes = listOf("jdk.internal.*") | ||
} | ||
} | ||
} | ||
|
||
private fun Project.configurePublishing() { | ||
extensions.configure<com.android.build.gradle.LibraryExtension> { | ||
publishing { | ||
singleVariant("release") { | ||
withSourcesJar() | ||
withJavadocJar() | ||
} | ||
} | ||
} | ||
extensions.configure<PublishingExtension> { | ||
publications { | ||
create<MavenPublication>("aar") { | ||
afterEvaluate { | ||
from(components["release"]) | ||
} | ||
pom { | ||
name.set(project.name) | ||
description.set("Kotlin extensions (KTX) for Google Maps SDK") | ||
url.set("https://github.com/googlemaps/android-maps-ktx") | ||
scm { | ||
connection.set("scm:[email protected]:googlemaps/android-maps-ktx.git") | ||
developerConnection.set("scm:[email protected]:googlemaps/android-maps-ktx.git") | ||
url.set("https://github.com/googlemaps/android-maps-ktx") | ||
} | ||
licenses { | ||
license { | ||
name.set("The Apache Software License, Version 2.0") | ||
url.set("http://www.apache.org/licenses/LICENSE-2.0.txt") | ||
distribution.set("repo") | ||
} | ||
} | ||
organization { | ||
name.set("Google Inc") | ||
url.set("http://developers.google.com/maps") | ||
} | ||
developers { | ||
developer { | ||
name.set("Google Inc.") | ||
} | ||
} | ||
} | ||
} | ||
} | ||
repositories { | ||
maven { | ||
val releasesRepoUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/") | ||
val snapshotsRepoUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/") | ||
url = if (project.version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl | ||
credentials { | ||
username = project.findProperty("sonatypeToken") as String? | ||
password = project.findProperty("sonatypeTokenPassword") as String? | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
private fun Project.configureSigning() { | ||
configure<SigningExtension> { | ||
sign(extensions.getByType<PublishingExtension>().publications["aar"]) | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
dependencyResolutionManagement { | ||
repositories { | ||
google() | ||
mavenCentral() | ||
} | ||
versionCatalogs { | ||
create("libs") { | ||
from(files("../gradle/libs.versions.toml")) | ||
} | ||
} | ||
} | ||
|
||
rootProject.name = "build-logic" | ||
include(":convention") |
Oops, something went wrong.