fix: Restore Android 5-7 support

See: relaycorp/awala-endpoint-android#87
AwalaApp · Aug 19, 2021 · b7b8ac2 · b7b8ac2
1 parent 23f9544
commit b7b8ac2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/codelabs/android-centralised.md b/codelabs/android-centralised.md
@@ -58,7 +58,7 @@ Let's create a new project on Android Studio by going to `File` -> `New` -> `New
 
 ![](./images/android-centralised/android-studio-project-template.png)
 
-In the final screen, make sure to leave Kotlin as the programming language and API 26 as the minimum Android SDK ([we plan to restore support for API 21-25 soon](https://github.com/relaycorp/awala-endpoint-android/issues/87)).
+In the final screen, make sure to leave Kotlin as the programming language and API 21 as the minimum Android SDK.
 
 ![](./images/android-centralised/android-studio-project-config.png)
 

diff --git a/examples/android-centralised/app/build.gradle b/examples/android-centralised/app/build.gradle
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.pingcodelab"
-        minSdkVersion 26
+        minSdkVersion 21
         targetSdkVersion 30
         versionCode 1
         versionName "1.0"

diff --git a/examples/android-centralised/build.gradle b/examples/android-centralised/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.2"
+        classpath 'com.android.tools.build:gradle:7.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/examples/android-centralised/gradle.properties b/examples/android-centralised/gradle.properties
@@ -21,4 +21,4 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # Workaround for https://issuetracker.google.com/issues/159151549
-android.jetifier.blacklist = bcprov-jdk15on-1.*.jar
+android.jetifier.ignorelist = bcprov-jdk15on-1.*.jar
diff --git a/examples/android-centralised/gradle/wrapper/gradle-wrapper.properties b/examples/android-centralised/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip