Merge branch 'main' into fix/no-threads

getsentry · Nov 24, 2020 · f05d1eb · f05d1eb
2 parents a1887c8 + e33333b
commit f05d1eb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,13 @@
 # vNext
 
+* Fix: Set current thread only if theres no exceptions
+
+# 4.0.0-alpha.1
+
 * Enhancement: Load `sentry.properties` from the application's current working directory (#1046)
 * Ref: Refactor JSON deserialization (#1047)
-* Fix: Set current thread only if theres no exceptions
+* Feat: Performance monitoring (#971)
+* Feat: Performance monitoring for Spring Boot applications (#971)
 
 # 3.2.0
 
@@ -22,8 +27,6 @@
 * Fix broken NDK integration on 3.1.2 (release failed on packaging a .so file)
 * Increase max cached events to 30 (#1029)
 * Normalize DSN URI (#1030)
-* feat: Performance monitoring (#971)
-* feat: Performance monitoring for Spring Boot applications
 
 # 3.1.2
 

diff --git a/gradle.properties b/gradle.properties
@@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=512m -XX:MaxMetaspaceSize=512m -XX:+He
 android.useAndroidX=true
 
 # Release information
-buildVersionCode=20049
-versionName=3.2.1-SNAPSHOT
+buildVersionCode=20050
+versionName=4.0.0-alpha.2-SNAPSHOT
 
 # disable renderscript, it's enabled by default
 android.defaults.buildfeatures.renderscript=false