diff --git a/build.gradle.kts b/build.gradle.kts index 6c2d0480f9..b155e68fef 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -27,19 +27,15 @@ plugins { alias(libs.plugins.errorprone) apply false alias(libs.plugins.gradle.versions) apply false alias(libs.plugins.spring.dependency.management) 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 + // id("io.sentry.android.gradle") version "5.6.0" 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) + classpath(libs.commons.compress) } } 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/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" } 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() } }