Merge pull request #77 from tobymurray/update-tooling

Update Gradle, Kotlin, and Gradle plug-in for Android

README.md

@@ -22,7 +22,7 @@ As currently there is no end-to-end encryption implemented in this app, for priv
   - Bot Username: is the username of the just created user
   - Bot Password: is the password of the just created user
   - Homeserver url: is the url of the homeserver where the user is created
-  - Your username: is where you want to forward all yous text message to
+  - Your username: is where you want to forward all your text messages to
   - Devicename: is the devicename wich the api will use
 - Press save
 - Now all your text messages will be bridged

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "eu.droogers.smsmatrix"
         minSdkVersion 23
         targetSdkVersion 29
-        versionCode 15
+        versionCode 16
-        versionName "0.0.15"
+        versionName "0.0.16"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/AndroidManifest.xml

@@ -8,6 +8,7 @@
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         tools:replace="allowBackup,label"

app/src/main/java/eu/droogers/smsmatrix/MatrixService.java

@@ -113,7 +113,9 @@ public class MatrixService extends Service {
 
     @Override
     public void onDestroy() {
-        mx.destroy();
+        if (mx != null) {
+            mx.destroy();
+        }
         this.mms.stopMMSMonitoring();
         this.mms = null;
         super.onDestroy();

build.gradle

@@ -1,14 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.4.20'
 
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "io.realm:realm-gradle-plugin:5.8.0"
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 11 22:28:14 EEST 2019
+#Mon May 03 19:17:08 EDT 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip