Merge pull request #695 from ably/fix-android-release

Fix Android release
ably · Aug 5, 2021 · ed0e828 · ed0e828
2 parents 1f271d7 + ec43073
commit ed0e828
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 14 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -2,11 +2,10 @@ buildscript {
     repositories {
         mavenCentral()
         mavenLocal()
-        jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
     }
 }
 
@@ -19,14 +18,12 @@ ext {
 
 allprojects {
     repositories {
-        jcenter()
         google()
     }
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion '28.0.3'
+    compileSdkVersion 30
 
     defaultConfig {
         buildConfigField 'String', 'LIBRARY_NAME', '"android"'

diff --git a/android/src/main/java/io/ably/lib/push/ActivationStateMachine.java b/android/src/main/java/io/ably/lib/push/ActivationStateMachine.java
@@ -7,7 +7,6 @@
 import android.content.SharedPreferences;
 
 import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import android.support.v4.content.LocalBroadcastManager;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
 import io.ably.lib.http.Http;

diff --git a/common.gradle b/common.gradle
@@ -1,5 +1,4 @@
 repositories {
-    jcenter()
     mavenCentral()
 }
 

diff --git a/gradle-lint/build.gradle b/gradle-lint/build.gradle
@@ -7,7 +7,7 @@ plugins {
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 sourceSets {

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
 org.gradle.jvmargs=-Xmx1536M
+android.useAndroidX=true
diff --git a/java/build.gradle b/java/build.gradle
@@ -1,9 +1,3 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-}
-
 plugins {
     id 'de.fuerstenau.buildconfig' version '1.1.8'
     id 'checkstyle'
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		org.gradle.jvmargs=-Xmx1536M
		android.useAndroidX=true