Update AGP to 7.3.0, java to 11, kotlin to 1.6.10 (#378)

getsentry · Sep 30, 2022 · 4f91cb5 · 4f91cb5
1 parent c4a389b
commit 4f91cb5
Show file tree

Hide file tree

Showing 17 changed files with 76 additions and 75 deletions.
diff --git a/.github/workflows/test-publish-dry-run.yaml b/.github/workflows/test-publish-dry-run.yaml
@@ -26,25 +26,22 @@ jobs:
           - agp: "7.1.3"
             gradle: "7.3.3"
             java: "11"
-          - agp: "7.1.3"
+          - agp: "7.2.1"
             gradle: "7.4"
             java: "11"
-          - agp: "7.1.3"
-            gradle: "7.5"
-            java: "11"
           - agp: "7.2.1"
-            gradle: "7.3.3"
+            gradle: "7.5"
             java: "11"
-          - agp: "7.2.1"
+          - agp: "7.3.0"
             gradle: "7.4"
             java: "11"
-          - agp: "7.2.1"
+          - agp: "7.3.0"
             gradle: "7.5"
             java: "11"
-          - agp: "7.3.0-beta05"
+          - agp: "7.4.0-beta01"
             gradle: "7.5"
             java: "11"
-          - agp: "7.4.0-alpha03"
+          - agp: "8.0.0-alpha01"
             gradle: "7.5"
             java: "11"
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 ### Features
 
+- Bump AGP to v7.3.0 ([#378](https://github.com/getsentry/sentry-android-gradle-plugin/pull/378))
 - Bump CLI from v2.5.2 to v2.6.0 ([#379](https://github.com/getsentry/sentry-android-gradle-plugin/pull/379))
   - [changelog](https://github.com/getsentry/sentry-cli/blob/master/CHANGELOG.md#260)
   - [diff](https://github.com/getsentry/sentry-cli/compare/2.5.2...2.6.0)

diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -1,17 +1,24 @@
+import org.gradle.util.VersionNumber
+
 object BuildPluginsVersion {
-    val AGP = System.getenv("VERSION_AGP") ?: "7.2.1"
-    const val DOKKA = "1.5.31"
-    const val KOTLIN = "1.5.31"
-    const val KOTLIN_LANG_VERSION = "1.5"
+    val AGP = System.getenv("VERSION_AGP") ?: "7.3.0"
+    const val DOKKA = "1.6.10"
+    const val KOTLIN = "1.6.10"
     const val AAR_2_JAR = "0.6"
     const val KTLINT = "10.2.1"
     // do not upgrade to 0.18.0, it does not generate the pom-default.xml and module.json under
     // build/publications/maven
     const val MAVEN_PUBLISH = "0.17.0"
     const val PROGUARD = "7.1.0"
+
+	// proguard does not support AGP 8 yet
+    fun isProguardApplicable(): Boolean = VersionNumber.parse(AGP).major < 8
 }
 
 object LibsVersion {
+    const val SDK_VERSION = 33
+    const val MIN_SDK_VERSION = 21
+
     const val JUNIT = "4.13.2"
     const val ASM = "7.0" // compatibility matrix -> https://developer.android.com/reference/tools/gradle-api/7.1/com/android/build/api/instrumentation/InstrumentationContext#apiversion
     const val SQLITE = "2.1.0"
@@ -55,7 +62,7 @@ object Samples {
     }
 
     object Room {
-        private const val version = "2.3.0"
+        private const val version = "2.4.3"
         const val runtime = "androidx.room:room-runtime:${version}"
         const val ktx = "androidx.room:room-ktx:${version}"
         const val compiler = "androidx.room:room-compiler:${version}"

diff --git a/examples/android-gradle-kts/build.gradle.kts b/examples/android-gradle-kts/build.gradle.kts
@@ -4,10 +4,10 @@ plugins {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdk = 21
-        targetSdk = 30
+        minSdk = LibsVersion.MIN_SDK_VERSION
+        targetSdk = LibsVersion.SDK_VERSION
         versionCode = 1
         versionName = "1.0"
     }
@@ -17,6 +17,7 @@ android {
             proguardFiles.add(getDefaultProguardFile("proguard-android-optimize.txt"))
         }
     }
+    namespace = "com.example.sampleapp"
 }
 
 sentry {

diff --git a/examples/android-gradle-kts/src/main/AndroidManifest.xml b/examples/android-gradle-kts/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.sampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name=".MainActivity"/>
     </application>

diff --git a/examples/android-gradle/build.gradle b/examples/android-gradle/build.gradle
@@ -14,10 +14,10 @@ apply plugin: 'com.android.application'
 apply plugin: 'io.sentry.android.gradle'
 
 android {
-    compileSdkVersion = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk LibsVersion.MIN_SDK_VERSION
+        targetSdk LibsVersion.SDK_VERSION
         versionCode = 1
         versionName = "1.0"
     }
@@ -28,6 +28,7 @@ android {
               'proguard-android-optimize.txt')
         }
     }
+    namespace 'com.example.sampleapp'
 }
 
 sentry {

diff --git a/examples/android-gradle/src/main/AndroidManifest.xml b/examples/android-gradle/src/main/AndroidManifest.xml
@@ -1,12 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.sampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
-        <activity android:name=".MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                    <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <meta-data android:name="io.sentry.dsn" android:value="https://examplePublicKey@o0.ingest.sentry.io/0" />
+        <activity android:name=".MainActivity"/>
     </application>
 </manifest>
diff --git a/examples/android-guardsquare-proguard/build.gradle b/examples/android-guardsquare-proguard/build.gradle
@@ -13,13 +13,15 @@ buildscript {
 
 apply plugin: 'com.android.application'
 apply plugin: 'io.sentry.android.gradle'
-apply plugin: 'com.guardsquare.proguard'
+if (BuildPluginsVersion.INSTANCE.isProguardApplicable()) {
+    apply plugin: 'com.guardsquare.proguard'
+}
 
 android {
-    compileSdkVersion = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdk LibsVersion.MIN_SDK_VERSION
+        targetSdk LibsVersion.SDK_VERSION
         versionCode = 1
         versionName = "1.0"
     }
@@ -29,15 +31,18 @@ android {
             minifyEnabled false
         }
     }
+    namespace 'com.example.sampleapp'
 }
 
-proguard {
-   configurations {
-      release {
-         defaultConfiguration "proguard-android-optimize.txt"
-         configuration "proguard-project.txt"
-      }
-   }
+if (BuildPluginsVersion.INSTANCE.isProguardApplicable()) {
+    proguard {
+        configurations {
+            release {
+                defaultConfiguration "proguard-android-optimize.txt"
+                configuration "proguard-project.txt"
+            }
+        }
+    }
 }
 
 sentry {

diff --git a/examples/android-guardsquare-proguard/src/main/AndroidManifest.xml b/examples/android-guardsquare-proguard/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.sampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name=".MainActivity"/>
     </application>

diff --git a/examples/android-instrumentation-sample/build.gradle.kts b/examples/android-instrumentation-sample/build.gradle.kts
@@ -14,10 +14,10 @@ plugins {
 // }
 
 android {
-    compileSdk = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdk = 21
-        targetSdk = 30
+        minSdk = LibsVersion.MIN_SDK_VERSION
+        targetSdk = LibsVersion.SDK_VERSION
         versionCode = 1
         versionName = "1.0"
     }
@@ -41,6 +41,7 @@ android {
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "io.sentry.samples.instrumentation"
 }
 
 // useful, when we want to modify room-generated classes, and then compile them into .class files

diff --git a/examples/android-instrumentation-sample/src/main/AndroidManifest.xml b/examples/android-instrumentation-sample/src/main/AndroidManifest.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="io.sentry.samples.instrumentation">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application android:name=".SampleApp">
         <activity
             android:name=".ui.MainActivity"
-            android:theme="@style/Theme.AppCompat.NoActionBar">
+            android:theme="@style/Theme.AppCompat.NoActionBar"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/examples/android-ndk/build.gradle b/examples/android-ndk/build.gradle
@@ -13,10 +13,10 @@ buildscript {
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion LibsVersion.MIN_SDK_VERSION
+        targetSdk LibsVersion.SDK_VERSION
         versionCode = 1
         versionName = "1.0"
     }
@@ -30,6 +30,7 @@ android {
             path "jni/Android.mk"
         }
     }
+    namespace 'com.example.sampleapp'
 }
 
 if (System.getenv("AUTO_UPLOAD")) {

diff --git a/examples/android-ndk/src/main/AndroidManifest.xml b/examples/android-ndk/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.example.sampleapp">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name=".MainActivity"/>
     </application>

diff --git a/examples/android-room-lib/build.gradle.kts b/examples/android-room-lib/build.gradle.kts
@@ -4,15 +4,16 @@ plugins {
 }
 
 android {
-    compileSdk = 30
+    compileSdk = LibsVersion.SDK_VERSION
     defaultConfig {
-        minSdk = 21
-        targetSdk = 30
+        minSdk = LibsVersion.MIN_SDK_VERSION
+        targetSdk = LibsVersion.SDK_VERSION
     }
 
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
     }
+    namespace = "io.sentry.android.instrumentation.lib"
 }
 
 dependencies {

diff --git a/examples/android-room-lib/src/main/AndroidManifest.xml b/examples/android-room-lib/src/main/AndroidManifest.xml
diff --git a/plugin-build/build.gradle.kts b/plugin-build/build.gradle.kts
@@ -62,27 +62,28 @@ dependencies {
 }
 
 configure<JavaPluginExtension> {
-    sourceCompatibility = JavaVersion.VERSION_1_8
-    targetCompatibility = JavaVersion.VERSION_1_8
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(11))
+    }
 }
 
 // We need to compile Groovy first and let Kotlin depend on it.
 // See https://docs.gradle.org/6.1-rc-1/release-notes.html#compilation-order
 tasks.withType<GroovyCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
     classpath = sourceSets["main"].compileClasspath
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    sourceCompatibility = JavaVersion.VERSION_1_8.toString()
-    targetCompatibility = JavaVersion.VERSION_1_8.toString()
+    sourceCompatibility = JavaVersion.VERSION_11.toString()
+    targetCompatibility = JavaVersion.VERSION_11.toString()
     classpath += files(sourceSets["main"].groovy.classesDirectory)
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_1_8.toString()
+        jvmTarget = JavaVersion.VERSION_11.toString()
         freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=enable")
-        languageVersion = "1.3"
+        languageVersion = "1.4"
     }
 }
 

diff --git a/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt b/plugin-build/src/test/kotlin/io/sentry/android/gradle/BaseSentryPluginTest.kt
@@ -94,18 +94,15 @@ abstract class BaseSentryPluginTest(
             // The supported Gradle version can be found here:
             // https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
             // The pair is [AGP Version, Gradle Version]
-            arrayOf("7.0.4", "7.0.2"),
-            arrayOf("7.0.4", "7.1.1"),
             arrayOf("7.0.4", "7.2"),
             arrayOf("7.1.3", "7.2"),
-            arrayOf("7.1.3", "7.3.3"),
-            arrayOf("7.1.3", "7.4"),
-            arrayOf("7.1.3", "7.5"),
             arrayOf("7.2.1", "7.3.3"),
             arrayOf("7.2.1", "7.4"),
             arrayOf("7.2.1", "7.5"),
-            arrayOf("7.3.0-beta05", "7.5"),
-            arrayOf("7.4.0-alpha03", "7.5")
+            arrayOf("7.3.0", "7.4"),
+            arrayOf("7.3.0", "7.5"),
+            arrayOf("7.4.0-beta01", "7.5"),
+            arrayOf("8.0.0-alpha01", "7.5")
         )
 
         internal fun GradleRunner.appendArguments(vararg arguments: String) =