A fully functional Android app built entirely with Kotlin and Jetpack Compose
Clean up loading of oss-licenses-plugin
Aurimas Liutikasc53ceff6f4e7
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex fe3e2ec49..5b32add3e 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -22,7 +22,7 @@ plugins {alias(libs.plugins.nowinandroid.android.application.jacoco)alias(libs.plugins.nowinandroid.android.application.firebase)alias(libs.plugins.nowinandroid.hilt)- id("com.google.android.gms.oss-licenses-plugin")+ alias(libs.plugins.google.osslicenses)alias(libs.plugins.baselineprofile)alias(libs.plugins.roborazzi)alias(libs.plugins.kotlin.serialization)diff --git a/build.gradle.kts b/build.gradle.ktsindex b7989bab4..425b2c640 100644--- a/build.gradle.kts+++ b/build.gradle.kts@@ -14,28 +14,6 @@* limitations under the License.*/-buildscript {- repositories {- google {- content {- includeGroupByRegex("com\\.android.*")- includeGroupByRegex("com\\.google.*")- includeGroupByRegex("androidx.*")- }- }- mavenCentral()-- // This is used only for internal Google builds.- maven { url = uri("../nowinandroid-prebuilts/m2repository") }- }- dependencies {- classpath(libs.google.oss.licenses.plugin) {- exclude(group = "com.google.protobuf")- }- }--}-/** By listing all the plugins used throughout all subprojects in the root project build script, it* ensures that the build script classpath remains the same for all projects. This avoids potential@@ -58,7 +36,7 @@ plugins {alias(libs.plugins.hilt) apply falsealias(libs.plugins.ksp) apply falsealias(libs.plugins.roborazzi) apply false- alias(libs.plugins.secrets) apply false+ alias(libs.plugins.google.osslicenses) apply falsealias(libs.plugins.room) apply falsealias(libs.plugins.module.graph) apply true // Plugin applied to allow module graph generation}diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 5052dea76..46c845404 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -37,7 +37,7 @@ firebaseCrashlyticsPlugin = "3.0.6"firebasePerfPlugin = "2.0.1"gmsPlugin = "4.4.2"googleOss = "17.1.0"-googleOssPlugin = "0.10.7"+googleOssPlugin = "0.10.8"hilt = "2.56"hiltExt = "1.2.0"jacoco = "0.8.12"@@ -56,7 +56,6 @@ retrofitKotlinxSerializationJson = "1.0.0"robolectric = "4.14.1"roborazzi = "1.39.0"room = "2.7.2"-secrets = "2.0.1"truth = "1.4.4"turbine = "1.2.0"@@ -119,7 +118,6 @@ firebase-cloud-messaging = { group = "com.google.firebase", name = "firebase-mesfirebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }firebase-performance = { group = "com.google.firebase", name = "firebase-perf" }google-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "googleOss" }-google-oss-licenses-plugin = { group = "com.google.android.gms", name = "oss-licenses-plugin", version.ref = "googleOssPlugin" }hilt-android = { group = "com.google.dagger", name = "hilt-android", version.ref = "hilt" }hilt-android-testing = { group = "com.google.dagger", name = "hilt-android-testing", version.ref = "hilt" }hilt-compiler = { group = "com.google.dagger", name = "hilt-compiler", version.ref = "hilt" }@@ -178,10 +176,10 @@ kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }module-graph = { id = "com.jraska.module.graph.assertion", version.ref = "moduleGraph" }+google-osslicenses = { id = "com.google.android.gms.oss-licenses-plugin", version.ref = "googleOssPlugin" }protobuf = { id = "com.google.protobuf", version.ref = "protobufPlugin" }roborazzi = { id = "io.github.takahirom.roborazzi", version.ref = "roborazzi" }room = { id = "androidx.room", version.ref = "room" }-secrets = { id = "com.google.android.libraries.mapsplatform.secrets-gradle-plugin", version.ref = "secrets" }# Plugins defined by this projectnowinandroid-android-application = { id = "nowinandroid.android.application" }