Merge pull request #77 from tobymurray/update-tooling

Update Gradle, Kotlin, and Gradle plug-in for Android
Merge pull request #80 from HammyHavoc/patch-1
2024-10-27 18:24:01 +00:00 · 2023-06-19 21:12:07 +02:00 · 2023-06-19 21:10:55 +02:00 · 2021-07-30 00:05:51 +01:00 · 2021-05-03 19:25:37 -04:00 · 2019-12-04 20:03:03 +01:00
6 changed files with 11 additions and 8 deletions
--- a/README.md
+++ b/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
--- a/app/build.gradle
+++ b/app/build.gradle
@ -10,8 +10,8 @@ android {
        applicationId "eu.droogers.smsmatrix"
        minSdkVersion 23
        targetSdkVersion 29
-        versionCode 15
-        versionName "0.0.15"
+        versionCode 16
+        versionName "0.0.16"
        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
    buildTypes {
--- a/app/src/main/AndroidManifest.xml
+++ b/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"
--- a/app/src/main/java/eu/droogers/smsmatrix/MatrixService.java
+++ b/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();
--- a/build.gradle
+++ b/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"

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/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
Author	SHA1	Message	Date
tijder	d0810b99b6	Merge pull request #77 from tobymurray/update-tooling Update Gradle, Kotlin, and Gradle plug-in for Android	2023-06-19 21:12:07 +02:00
tijder	8ccbf530dd	Merge pull request #80 from HammyHavoc/patch-1 Fixed typos	2023-06-19 21:10:55 +02:00
Hammy Havoc	17177fc7a9	Fixed typos :- )	2021-07-30 00:05:51 +01:00
Toby Murray	1dc6f435ce	Update Gradle, Kotlin, and Gradle plug-in for Android Trying to build/install this application in a new installation of Android Studio yielded: > Unable to determine application id: com.android.tools.idea.run.ApkProvisionException: Error loading build artifacts from:<snip>\sms-matrix\app\build\outputs\apk\debug\output-metadata.json This updates the versions of applications central to building the Android project to make it compatible. This does not (intentionally, at least) have any functional impact on the application at all. I opted not to jump to Gradle 7.0 as it has just recently been released and increasing 1 major version is change enough for one PR.	2021-05-03 19:25:37 -04:00
tijder	e7f96ba44a	Update to version 0.0.16	2019-12-04 20:03:03 +01:00
Gerben Droogers	820036d483	Fix crash at startup	2019-12-03 22:25:12 +01:00