Bump AGP to 7.0.2 (#1650)

getsentry · Sep 14, 2021 · 13ebeb3 · 13ebeb3
1 parent 1319305
commit 13ebeb3
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 49 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,7 +19,7 @@ jobs:
         # TODO: windows-latest
         os: [ubuntu-latest, macos-latest]
         # Zulu Community distribution of OpenJDK
-        java: [ '8', '11' ]
+        java: [ '11' ]
 
     steps:
       - name: Git checkout
@@ -51,7 +51,7 @@ jobs:
 
       - name: Archive packages
         # We need artifacts from only one the builds
-        if: runner.os == 'Linux' && matrix.java == '8'
+        if: runner.os == 'Linux' && matrix.java == '11'
         uses: actions/upload-artifact@v2
         with:
           name: ${{ github.sha }}
@@ -61,7 +61,7 @@ jobs:
 
       - name: Upload coverage to Codecov
         # We need coverage data from only one the builds
-        if: runner.os == 'Linux' && matrix.java == '8'
+        if: runner.os == 'Linux' && matrix.java == '11'
         uses: codecov/codecov-action@v1
         with:
           name: sentry-java
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -14,11 +14,11 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '11'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2

diff --git a/.github/workflows/generate-javadocs.yml b/.github/workflows/generate-javadocs.yml
@@ -10,11 +10,11 @@ jobs:
     steps:
       - name: Checkout 🛎️
         uses: actions/checkout@v2
-      - name: set up JDK 1.8
+      - name: set up JDK 11
         uses: actions/setup-java@v2
         with:
           distribution: 'adopt'
-          java-version: '8'
+          java-version: '11'
 
       - name: Cache Gradle packages
         uses: actions/cache@v2

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+* Bump AGP to 7.0.2 (#1650)
+
 ## 5.2.0-beta.1
 
 * Feat: Add tracestate HTTP header support (#1683)

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -9,7 +9,7 @@ object Config {
     val springKotlinCompatibleLanguageVersion = "1.3"
 
     object BuildPlugins {
-        val androidGradle = "com.android.tools.build:gradle:4.2.2"
+        val androidGradle = "com.android.tools.build:gradle:7.0.2"
         val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
         val buildConfigVersion = "3.0.0"
@@ -147,7 +147,6 @@ object Config {
         val group = "io.sentry"
         val description = "SDK for sentry.io"
         val versionNameProp = "versionName"
-        val buildVersionCodeProp = "buildVersionCode"
     }
 
     object CompileOnly {

diff --git a/gradle.properties b/gradle.properties
@@ -5,7 +5,6 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+H
 android.useAndroidX=true
 
 # Release information
-buildVersionCode=20082
 versionName=5.2.0-beta.2-SNAPSHOT
 
 # disable renderscript, it's enabled by default

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh
@@ -12,6 +12,3 @@ GRADLE_FILEPATH="gradle.properties"
 # Replace `versionName` with the given version
 VERSION_NAME_PATTERN="versionName"
 sed -i "" -e "s/$VERSION_NAME_PATTERN=.*$/$VERSION_NAME_PATTERN=$NEW_VERSION/g" $GRADLE_FILEPATH
-
-# Don't bump `buildVersionCode` since it's bumped after doing the release.
-# See comments in `post-release.sh`.
diff --git a/scripts/post-release.sh b/scripts/post-release.sh
@@ -30,15 +30,6 @@ version_digit_to_bump="$( awk "/$VERSION_NAME_PATTERN/" $GRADLE_FILEPATH | egrep
 new_version="$( echo $version | sed "s/[0-9]*$/$version_digit_to_bump/g" )"
 sed -i "" -e "s/$VERSION_NAME_PATTERN=.*$/$VERSION_NAME_PATTERN=$new_version-SNAPSHOT/g" $GRADLE_FILEPATH
 
-# Increment `buildVersionCode`
-# After having incremented the version name (see comments above), the new version
-# still has the version code of the version in production. This must be
-# incremented to align with the new version.
-VERSION_CODE_PATTERN="buildVersionCode"
-VERSION_NUMBER="$( awk "/$VERSION_CODE_PATTERN/" $GRADLE_FILEPATH | grep -o '[0-9]\+' )"
-((VERSION_NUMBER++))
-sed -i "" -e "s/$VERSION_CODE_PATTERN=.*$/$VERSION_CODE_PATTERN=$VERSION_NUMBER/g" $GRADLE_FILEPATH
-
 git add .
 git commit -m "Prepare $new_version"
 git push
diff --git a/sentry-android-core/build.gradle.kts b/sentry-android-core/build.gradle.kts
@@ -18,13 +18,10 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
-
         buildConfigField("String", "SENTRY_ANDROID_SDK_NAME", "\"${Config.Sentry.SENTRY_ANDROID_SDK_NAME}\"")
 
         // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"$versionName\"")
+        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
     }
 
     buildTypes {

diff --git a/sentry-android-fragment/build.gradle.kts b/sentry-android-fragment/build.gradle.kts
@@ -16,11 +16,8 @@ android {
         targetSdkVersion(Config.Android.targetSdkVersion)
         minSdkVersion(Config.Android.minSdkVersion)
 
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
-
         // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"$versionName\"")
+        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
     }
 
     buildTypes {

diff --git a/sentry-android-ndk/build.gradle.kts b/sentry-android-ndk/build.gradle.kts
@@ -26,9 +26,6 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
-
         externalNativeBuild {
             cmake {
                 arguments.add(0, "-DANDROID_STL=c++_static")
@@ -41,7 +38,7 @@ android {
         }
 
         // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"$versionName\"")
+        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
     }
 
     // we use the default NDK and CMake versions based on the AGP's version

diff --git a/sentry-android-okhttp/build.gradle.kts b/sentry-android-okhttp/build.gradle.kts
@@ -17,11 +17,8 @@ android {
         targetSdkVersion(Config.Android.targetSdkVersion)
         minSdkVersion(Config.Android.minSdkVersionOkHttp)
 
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
-
         // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"$versionName\"")
+        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
     }
 
     buildTypes {

diff --git a/sentry-android-timber/build.gradle.kts b/sentry-android-timber/build.gradle.kts
@@ -20,11 +20,8 @@ android {
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
 
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
-
         // for AGP 4.1
-        buildConfigField("String", "VERSION_NAME", "\"$versionName\"")
+        buildConfigField("String", "VERSION_NAME", "\"${project.version}\"")
         buildConfigField("String", "SENTRY_TIMBER_SDK_NAME", "\"${Config.Sentry.SENTRY_TIMBER_SDK_NAME}\"")
     }
 

diff --git a/sentry-android/build.gradle.kts b/sentry-android/build.gradle.kts
@@ -10,9 +10,6 @@ android {
     defaultConfig {
         targetSdkVersion(Config.Android.targetSdkVersion)
         minSdkVersion(Config.Android.minSdkVersionNdk)
-
-        versionName = project.version.toString()
-        versionCode = project.properties[Config.Sentry.buildVersionCodeProp].toString().toInt()
     }
 
     buildFeatures {

diff --git a/sentry-samples/sentry-samples-servlet/build.gradle.kts b/sentry-samples/sentry-samples-servlet/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
 group = "io.sentry.sample.servlet"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()

diff --git a/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 group = "io.sentry.sample.spring-boot"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()

diff --git a/sentry-samples/sentry-samples-spring-boot/build.gradle.kts b/sentry-samples/sentry-samples-spring-boot/build.gradle.kts
@@ -11,6 +11,7 @@ plugins {
 group = "io.sentry.sample.spring-boot"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()

diff --git a/sentry-samples/sentry-samples-spring/build.gradle.kts b/sentry-samples/sentry-samples-spring/build.gradle.kts
@@ -13,6 +13,7 @@ plugins {
 group = "io.sentry.sample.spring"
 version = "0.0.1-SNAPSHOT"
 java.sourceCompatibility = JavaVersion.VERSION_1_8
+java.targetCompatibility = JavaVersion.VERSION_1_8
 
 repositories {
     mavenCentral()

diff --git a/sentry.properties b/sentry.properties
@@ -1,4 +1,3 @@
-# how a sentry.properties looks like
-defaults.project=android
-defaults.org=man
+defaults.project=sentry-android
+defaults.org=sentry-sdks
 auth.token=