From 7ed5ff334fdc9d0c54cd36b4749433b483561c34 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 22 May 2025 10:07:44 +0200 Subject: [PATCH 1/4] Remove buildscript block from root build.gradle This also removes the commons library. Do we know why that was there? --- build.gradle.kts | 18 ++++-------------- buildSrc/src/main/java/Config.kt | 5 ----- settings.gradle.kts | 1 + 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6c2d0480f9..09e0c18a69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,20 +27,10 @@ plugins { alias(libs.plugins.errorprone) apply false alias(libs.plugins.gradle.versions) apply false alias(libs.plugins.spring.dependency.management) apply false -} - -buildscript { - repositories { - google() - } - dependencies { - classpath(Config.BuildPlugins.androidGradle) - - // add classpath of sentry android gradle plugin - // classpath("io.sentry:sentry-android-gradle-plugin:{version}") - - classpath(Config.BuildPlugins.commonsCompressOverride) - } + id("com.android.library") version Config.AGP apply false + id("com.android.application") version Config.AGP apply false + // add classpath of sentry android gradle plugin + // id("io.sentry.android.gradle") version "5.6.0" apply false } apiValidation { diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 96d8918311..7669f8a807 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -11,11 +11,6 @@ object Config { val androidComposeCompilerVersion = "1.5.14" - object BuildPlugins { - val androidGradle = "com.android.tools.build:gradle:$AGP" - val commonsCompressOverride = "org.apache.commons:commons-compress:1.25.0" - } - object Android { val abiFilters = listOf("x86", "armeabi-v7a", "x86_64", "arm64-v8a") diff --git a/settings.gradle.kts b/settings.gradle.kts index 7b4ead5389..61f5fcb24c 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -4,6 +4,7 @@ pluginManagement { repositories { mavenCentral() gradlePluginPortal() + google() } } From 62f5a325d3f4154d04ecf2a98f2af67706484a88 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 22 May 2025 12:50:51 +0200 Subject: [PATCH 2/4] add spring boot two to root --- build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle.kts b/build.gradle.kts index 09e0c18a69..a0880de09b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,6 +27,7 @@ plugins { alias(libs.plugins.errorprone) apply false alias(libs.plugins.gradle.versions) apply false alias(libs.plugins.spring.dependency.management) apply false + alias(libs.plugins.spring.boot.two) apply false id("com.android.library") version Config.AGP apply false id("com.android.application") version Config.AGP apply false // add classpath of sentry android gradle plugin From 7a1685c2b76201de53d25103e32f10d993334769 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 22 May 2025 12:57:30 +0200 Subject: [PATCH 3/4] add commons compress --- build.gradle.kts | 1 - buildSrc/build.gradle.kts | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index a0880de09b..09e0c18a69 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,7 +27,6 @@ plugins { alias(libs.plugins.errorprone) apply false alias(libs.plugins.gradle.versions) apply false alias(libs.plugins.spring.dependency.management) apply false - alias(libs.plugins.spring.boot.two) apply false id("com.android.library") version Config.AGP apply false id("com.android.application") version Config.AGP apply false // add classpath of sentry android gradle plugin diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 5d8cbb335f..330f1d7163 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,3 +11,7 @@ repositories { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } + +dependencies { + implementation("org.apache.commons:commons-compress:1.25.0") +} From 4eab77468b943fb49ccf50f24ae0b647886d43aa Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Thu, 22 May 2025 16:52:15 +0200 Subject: [PATCH 4/4] move to buildscript classpath --- build.gradle.kts | 6 ++++++ buildSrc/build.gradle.kts | 4 ---- gradle/libs.versions.toml | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 09e0c18a69..b155e68fef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,6 +33,12 @@ plugins { // id("io.sentry.android.gradle") version "5.6.0" apply false } +buildscript { + dependencies { + classpath(libs.commons.compress) + } +} + apiValidation { ignoredPackages.addAll( setOf( diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index 330f1d7163..5d8cbb335f 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -11,7 +11,3 @@ repositories { tasks.withType().configureEach { kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString() } - -dependencies { - implementation("org.apache.commons:commons-compress:1.25.0") -} diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 1cfeb191fe..e974811b9a 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -49,6 +49,7 @@ androidx-navigation-runtime = { module = "androidx.navigation:navigation-runtime androidx-navigation-compose = { module = "androidx.navigation:navigation-compose", version.ref = "androidxNavigation" } coil-compose = { module = "io.coil-kt:coil-compose", version = "2.6.0" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +commons-compress = { module = "org.apache.commons:commons-compress", version = "1.25.0" } # test libraries androidx-test-core = { module = "androidx.test:core", version.ref = "androidxTestCore" }