Update AGP/Gradle to 8.x, remove proguard

spotify · Mar 20, 2024 · e43873e · e43873e
1 parent 1730351
commit e43873e
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 206 deletions.
diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -19,7 +19,6 @@ object Dependencies {
 
     const val ANDROID_GRADLE_PLUGIN = "com.android.tools.build:gradle:${Versions.ANDROID_GRADLE_PLUGIN}"
     const val KOTLIN_GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.KOTLIN}"
-    const val PROGUARD_GRADLE_PLUGIN = "com.guardsquare:proguard-gradle:${Versions.PROGUARD_GRADLE_PLUGIN}"
     const val KOTLINX_SERIALIZATION_GRADLE_PLUGIN = "org.jetbrains.kotlin:kotlin-serialization:${Versions.KOTLIN}"
     const val DETEKT_GRADLE_PLUGIN = "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${Versions.DETEKT_GRADLE_PLUGIN}"
     const val NEXUS_PUBLISH_GRADLE_PLUGIN = "io.github.gradle-nexus.publish-plugin:io.github.gradle-nexus.publish-plugin.gradle.plugin:${Versions.NEXUS_PUBLISH_GRADLE_PLUGIN}"
@@ -58,9 +57,8 @@ object Dependencies {
     const val APEX_CHARTS = "apexcharts"
 
     object Versions {
-        const val ANDROID_GRADLE_PLUGIN = "7.4.2" // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
+        const val ANDROID_GRADLE_PLUGIN = "8.2.0" // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google
         const val KOTLIN = "1.8.20" // https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
-        const val PROGUARD_GRADLE_PLUGIN = "7.2.1" // https://mvnrepository.com/artifact/com.guardsquare/proguard-gradle
         const val DETEKT_GRADLE_PLUGIN = "1.21.0" // https://mvnrepository.com/artifact/io.gitlab.arturbosch.detekt/detekt-gradle-plugin
         const val NEXUS_PUBLISH_GRADLE_PLUGIN = "1.1.0" // https://mvnrepository.com/artifact/io.github.gradle-nexus.publish-plugin/io.github.gradle-nexus.publish-plugin.gradle.plugin
         const val SHADOW_GRADLE_PLUGIN = "7.1.2" // https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
@@ -83,8 +81,8 @@ object Dependencies {
         const val KOTLIN_REACT_ROUTER = "6.11.0-pre.545" // https://mvnrepository.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-react-router-dom
         const val KOTLIN_JS_EXTENSIONS = "1.0.1-pre.545" // https://mvnrepository.com/artifact/org.jetbrains.kotlin-wrappers/kotlin-extensions
 
-        const val SELENIUM_WEBDRIVER = "4.11.0" // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java
-        const val SELENIUM_WEBDRIVER_MANAGER = "5.5.2" // https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager
+        const val SELENIUM_WEBDRIVER = "4.18.1" // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java
+        const val SELENIUM_WEBDRIVER_MANAGER = "5.7.0" // https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager
 
         const val REACT = "18.2.0" // https://www.npmjs.com/package/react
         const val BOOTSTRAP = "5.2.1" // https://www.npmjs.com/package/bootstrap

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed Mar 20 11:02:53 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/ruler-common/src/test/resources/project-fixture/app/build.gradle b/ruler-common/src/test/resources/project-fixture/app/build.gradle
@@ -20,11 +20,11 @@ plugins {
 }
 
 android {
-    compileSdk = 31
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.spotify.ruler.test"
         minSdk = 23
-        targetSdk = 31
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/ruler-e2e-tests/build.gradle.kts b/ruler-e2e-tests/build.gradle.kts
@@ -35,7 +35,6 @@ tasks.withType<Test> {
     // Make reports of the sample project available
     dependsOn(":sample:app:analyzeDebugBundle")
     dependsOn(":sample:app:analyzeReleaseBundle")
-    dependsOn(":sample:proguard:analyzeReleaseBundle")
 }
 
 java {

diff --git a/ruler-gradle-plugin/src/test/resources/project-fixture/app/build.gradle b/ruler-gradle-plugin/src/test/resources/project-fixture/app/build.gradle
@@ -21,11 +21,11 @@ plugins {
 
 android {
     namespace "com.spotify.ruler.test"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "com.spotify.ruler.test"
         minSdk = 23
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/sample/app/build.gradle.kts b/sample/app/build.gradle.kts
@@ -23,12 +23,12 @@ plugins {
 
 android {
     namespace = "com.spotify.ruler.sample.app"
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "com.spotify.ruler.sample"
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
         versionCode = 1
         versionName = "1.0"
     }

diff --git a/sample/lib/build.gradle.kts b/sample/lib/build.gradle.kts
@@ -22,10 +22,10 @@ plugins {
 
 android {
     namespace = "com.spotify.ruler.sample.lib"
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         minSdk = 21
-        targetSdk = 33
+        targetSdk = 34
     }
     lint {
         warningsAsErrors = true

diff --git a/sample/proguard/.gitignore b/sample/proguard/.gitignore
diff --git a/sample/proguard/build.gradle.kts b/sample/proguard/build.gradle.kts
diff --git a/sample/proguard/src/main/AndroidManifest.xml b/sample/proguard/src/main/AndroidManifest.xml
diff --git a/sample/proguard/src/main/kotlin/com/spotify/ruler/sample/proguard/MainActivity.kt b/sample/proguard/src/main/kotlin/com/spotify/ruler/sample/proguard/MainActivity.kt
diff --git a/sample/proguard/src/main/res/layout/activity_main.xml b/sample/proguard/src/main/res/layout/activity_main.xml
diff --git a/sample/proguard/src/main/res/values/strings.xml b/sample/proguard/src/main/res/values/strings.xml