Merge branch 'gh-1334' of https://github.com/getsentry/sentry-java into

gh-1334

.craft.yml

@@ -1,6 +1,21 @@
-minVersion: 0.23.1
+minVersion: 0.24.4
 changelogPolicy: auto
 targets:
+  - name: symbol-collector
+    includeNames: /libsentry(-android)?\.so/
+    batchType: android
+    bundleIdPrefix: sentry-android-ndk-
+  - name: maven
+    includeNames: /^sentry.*$/
+    gradleCliPath: ./gradlew
+    mavenCliPath: scripts/mvnw
+    mavenSettingsPath: scripts/settings.xml
+    mavenRepoId: ossrh
+    mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2/
+    android:
+      distDirRegex: /^sentry-android-.*$/
+      fileReplaceeRegex: /\d\.\d\.\d(-\w+(\.\d)?)?(-SNAPSHOT)?/
+      fileReplacerStr: release.aar
   - name: github
     excludeNames: /^libsentry.*\.so$/
   - name: registry
@@ -20,14 +35,3 @@ targets:
       maven:io.sentry:sentry-android-okhttp:
       maven:io.sentry:sentry-kotlin-extensions:
       maven:io:sentry:sentry-android-fragment:
-  - name: maven
-    includeNames: /^sentry.*$/
-    gradleCliPath: ./gradlew
-    mavenCliPath: scripts/mvnw
-    mavenSettingsPath: scripts/settings.xml
-    mavenRepoId: ossrh
-    mavenRepoUrl: https://oss.sonatype.org/service/local/staging/deploy/maven2/
-    android:
-      distDirRegex: /^sentry-android-.*$/
-      fileReplaceeRegex: /\d\.\d\.\d(-\w+(\.\d)?)?(-SNAPSHOT)?/
-      fileReplacerStr: release.aar

.github/workflows/check-formatting.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - release/**
   pull_request:
     branches:
       - '*'

.github/workflows/gradle-wrapper-validation.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - main
+      - release/**
   pull_request:
     branches:
       - '*'

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 * Feat: Add request body extraction for Spring MVC integration (#1595)
 
+## 5.1.0-beta.4
+
+* Update sentry-native to 0.4.11 (#1591)
+
 ## 5.1.0-beta.3
 
 * Feat: Spring Webflux integration (#1529)

Makefile

@@ -1,4 +1,4 @@
-.PHONY: all clean compile dryRelease doRelease release update stop checkFormat format api
+.PHONY: all clean compile dryRelease update stop checkFormat format api
 
 all: stop clean checkFormat compile dryRelease
 
@@ -15,17 +15,6 @@ compile:
 dryRelease:
 	./gradlew publishToMavenLocal --no-daemon
 
-# deploy the current build to maven central
-# promotes the release to maven central
-doRelease:
-	cd scripts
-	kotlinc -script release.kts -- -d ../distributions | sh
-	cd ..
-	./gradlew closeAndReleaseRepository
-
-# clean, build, deploy and promote to maven central
-release: clean checkFormat compile doRelease
-
 # check for dependencies update
 update:
 	./gradlew dependencyUpdates -Drevision=release

build.gradle.kts

@@ -79,25 +79,13 @@ subprojects {
             }
         }
 
-        val rootDir = this.project.rootProject.projectDir
-        val distDir = File("${rootDir}${sep}distributions")
-
-        // create dir if it does not exist
-        distDir.mkdirs()
-
         tasks.named("distZip").configure {
             this.dependsOn("publishToMavenLocal")
             this.doLast {
                 val distributionFilePath = "${this.project.buildDir}${sep}distributions${sep}${this.project.name}-${this.project.version}.zip"
                 val file = File(distributionFilePath)
                 if (!file.exists()) throw IllegalStateException("Distribution file: $distributionFilePath does not exist")
                 if (file.length() == 0L) throw IllegalStateException("Distribution file: $distributionFilePath is empty")
-
-                val newFile = File("${distDir}${sep}${file.name}")
-                file.copyTo(newFile, overwrite = true)
-
-                UnzipUtils.unzip(newFile, distDir.path)
-                newFile.delete()
             }
         }
 

buildSrc/src/main/java/Config.kt

@@ -10,7 +10,7 @@ object Config {
     val springKotlinCompatibleLanguageVersion = "1.3"
 
     object BuildPlugins {
-        val androidGradle = "com.android.tools.build:gradle:4.2.1"
+        val androidGradle = "com.android.tools.build:gradle:4.2.2"
         val kotlinGradlePlugin = "gradle-plugin"
         val buildConfig = "com.github.gmazzo.buildconfig"
         val buildConfigVersion = "3.0.0"

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=1536m -XX:+H
 android.useAndroidX=true
 
 # Release information
-buildVersionCode=20073
-versionName=5.1.0-beta.4-SNAPSHOT
+buildVersionCode=20074
+versionName=5.1.0-beta.5-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false

scripts/bump-version.sh

@@ -7,9 +7,6 @@ cd $SCRIPT_DIR/..
 OLD_VERSION="$1"
 NEW_VERSION="$2"
 
-echo $OLD_VERSION
-echo $NEW_VERSION
-
 GRADLE_FILEPATH="gradle.properties"
 
 # Replace `versionName` with the given version

scripts/post-release.sh

@@ -7,6 +7,9 @@ cd $SCRIPT_DIR/..
 OLD_VERSION="${1}"
 NEW_VERSION="${2}"
 
+git checkout main
+GRADLE_FILEPATH="gradle.properties"
+
 # Add a new unreleased entry in the changelog
 sed -i "" 's/# Changelog/# Changelog\n\n## Unreleased/' CHANGELOG.md
 
@@ -34,4 +37,8 @@ sed -i "" -e "s/$VERSION_NAME_PATTERN=.*$/$VERSION_NAME_PATTERN=$new_version-SNA
 VERSION_CODE_PATTERN="buildVersionCode"
 VERSION_NUMBER="$( awk "/$VERSION_CODE_PATTERN/" $GRADLE_FILEPATH | grep -o '[0-9]\+' )"
 ((VERSION_NUMBER++))
-sed -ie "s/$VERSION_CODE_PATTERN=.*$/$VERSION_CODE_PATTERN=$VERSION_NUMBER/g" $GRADLE_FILEPATH
+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