Merge branch 'main' into gh-1365

CHANGELOG.md

@@ -1,7 +1,10 @@
 # Unreleased
 
+# 5.0.0-beta.4
+
 * Fix: Enrich Transactions with Context Data (#1469)
 * Feat: OkHttp callback for Customising the Span (#1478)
+* Bump: Apache HttpClient to 5.0.4 (#1476)
 
 # 5.0.0-beta.3
 

Makefile

@@ -1,6 +1,6 @@
-.PHONY: all, clean compile dryRelease doRelease release update stop checkFormat format
+.PHONY: all clean compile dryRelease doRelease release update stop checkFormat format api
 
-all: clean checkFormat compile dryRelease
+all: stop clean checkFormat compile dryRelease
 
 # deep clean
 clean:
@@ -11,17 +11,13 @@ compile:
 	./gradlew build
 
 # do a dry release (like a local deploy)
-# remember to add the -SNAPSHOT suffix to the version
 dryRelease:
 	./gradlew publishToMavenLocal --no-daemon
 
 # deploy the current build to maven central
-# remember to remove the -SNAPSHOT suffix from the version
 # promotes the release to maven central
 doRelease:
-	cd scripts
-	kotlinc -script release.kts -- -d ../distributions | sh
-	cd ..
+	kotlinc -script scripts/release.kts -- -d ../distributions | sh
 	./gradlew closeAndReleaseRepository
 
 # clean, build, deploy and promote to maven central

buildSrc/src/main/java/Config.kt

@@ -74,9 +74,7 @@ object Config {
         val aspectj = "org.aspectj:aspectjweaver"
         val servletApi = "javax.servlet:javax.servlet-api"
 
-        val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.3"
-        val apacheHttpCore = "org.apache.httpcomponents.core5:httpcore5:5.0.3"
-        val apacheHttpCoreH2 = "org.apache.httpcomponents.core5:httpcore5-h2:5.0.3"
+        val apacheHttpClient = "org.apache.httpcomponents.client5:httpclient5:5.0.4"
 
         private val retrofit2Version = "2.9.0"
         private val retrofit2Group = "com.squareup.retrofit2"

gradle.properties

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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

scripts/release.kts

@@ -5,16 +5,16 @@
  * For example, all packages are in the "distributions" directory:
  *
  * distributions
- *  ├── sentry-3.1.2-SNAPSHOT
- *  ├── sentry-android-3.1.2-SNAPSHOT
- *  ├── sentry-android-core-3.1.2-SNAPSHOT
- *  ├── sentry-android-ndk-3.1.2-SNAPSHOT
- *  ├── sentry-android-timber-3.1.2-SNAPSHOT
- *  ├── sentry-log4j2-3.1.2-SNAPSHOT
- *  ├── sentry-logback-3.1.2-SNAPSHOT
- *  ├── sentry-servlet-3.1.2-SNAPSHOT
- *  ├── sentry-spring-3.1.2-SNAPSHOT
- *  └── sentry-spring-boot-starter-3.1.2-SNAPSHOT
+ *  ├── sentry-3.1.2
+ *  ├── sentry-android-3.1.2
+ *  ├── sentry-android-core-3.1.2
+ *  ├── sentry-android-ndk-3.1.2
+ *  ├── sentry-android-timber-3.1.2
+ *  ├── sentry-log4j2-3.1.2
+ *  ├── sentry-logback-3.1.2
+ *  ├── sentry-servlet-3.1.2
+ *  ├── sentry-spring-3.1.2
+ *  └── sentry-spring-boot-starter-3.1.2
  *
  * To execute the script two environment variables that are used by Maven have to be present: OSSRH_USERNAME, OSSRH_PASSWORD
  *

sentry-apache-http-client-5/build.gradle.kts

@@ -22,8 +22,6 @@ tasks.withType<KotlinCompile>().configureEach {
 dependencies {
     api(project(":sentry"))
     api(Config.Libs.apacheHttpClient)
-    api(Config.Libs.apacheHttpCore)
-    api(Config.Libs.apacheHttpCoreH2)
 
     compileOnly(Config.CompileOnly.nopen)
     errorprone(Config.CompileOnly.nopenChecker)