Merge branch 'refs/heads/master' into rollbar-logback/build/SDK-351/u…

…pdate-dependency # Conflicts: # .github/workflows/ci.yml
rollbar · Aug 16, 2024 · 531e5f9 · 531e5f9
2 parents 034259c + 1ad4cc0
commit 531e5f9
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -56,10 +56,11 @@ jobs:
       - name: Environment info
         run: |
           ./gradlew --version
-          echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT}
           echo JAVA_HOME: ${JAVA_HOME}
           java -version
           javac -version
+          echo ANDROID_HOME: ${ANDROID_HOME}
+          echo ANDROID_SDK_ROOT: ${ANDROID_SDK_ROOT}
 
       - name: Build
         run: 'source ~/.jdk7_home && ./gradlew clean build'
@@ -83,6 +84,16 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Set up Java 11 for the Android SDK Manager
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+
+      - name: Install Android SDK
+        run: |
+          echo "Android SDK Manager version: `${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager --version`"
+          ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "platforms;android-27" "build-tools;28.0.3"
+
       - name: Set up Java 7
         uses: actions/setup-java@v1
         with:

diff --git a/build.gradle b/build.gradle
@@ -27,7 +27,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
 }
 

diff --git a/examples/rollbar-android/build.gradle b/examples/rollbar-android/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.2'

diff --git a/examples/rollbar-spring-webmvc/build.gradle b/examples/rollbar-spring-webmvc/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

diff --git a/examples/rollbar-struts2-spring/build.gradle b/examples/rollbar-struts2-spring/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

diff --git a/examples/rollbar-struts2/build.gradle b/examples/rollbar-struts2/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

diff --git a/examples/rollbar-web/build.gradle b/examples/rollbar-web/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME=1.10.1-SNAPSHOT
+VERSION_NAME=1.10.2-SNAPSHOT
 GROUP=com.rollbar
 
 POM_DESCRIPTION=For connecting your applications built on the JVM to Rollbar for Error Reporting

diff --git a/rollbar-android/build.gradle b/rollbar-android/build.gradle
@@ -2,7 +2,6 @@ buildscript {
     repositories {
         google()
         mavenCentral()
-        jcenter()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.6.2'
@@ -11,7 +10,7 @@ buildscript {
 
 repositories {
     google()
-    jcenter()
+    mavenCentral()
 }
 
 apply plugin: 'com.android.library'