Update dependencies

Kaljurand · Apr 1, 2023 · 616f9e7 · 616f9e7
1 parent c325c6a
commit 616f9e7
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,15 +6,15 @@ dependencies {
     // TODO: used only in ChunkedWebRecSessionResult, use Android's JSON library instead
     implementation 'com.googlecode.json-simple:json-simple:1.1'
     implementation 'com.koushikdutta.async:androidasync:3.1.0'
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.20'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
+    implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.8.10'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.preference:preference-ktx:1.2.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.0'
     // implementation 'androidx.activity:activity:1.4.0'
     implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0'
-    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'com.google.android.material:material:1.8.0'
     // Added only to resolve https://issuetracker.google.com/issues/242384116
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
 }
 
 android {
@@ -29,8 +29,8 @@ android {
         applicationId 'ee.ioc.phon.android.speak'
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 1816
-        versionName '1.8.16'
+        versionCode 1817
+        versionName '1.8.17'
         vectorDrawables.useSupportLibrary = true
         // Keep only en and et resources
         resConfigs 'en', 'et'

diff --git a/app/src/main/java/ee/ioc/phon/android/speak/demo/AbstractRecognizerDemoActivity.kt b/app/src/main/java/ee/ioc/phon/android/speak/demo/AbstractRecognizerDemoActivity.kt
@@ -16,13 +16,13 @@
 
 package ee.ioc.phon.android.speak.demo
 
-import androidx.appcompat.app.AppCompatActivity
 import android.content.Intent
 import android.content.pm.ResolveInfo
 import android.speech.RecognizerIntent
 import android.view.Menu
 import android.view.MenuItem
 import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
 import ee.ioc.phon.android.speak.R
 import ee.ioc.phon.android.speak.activity.GrammarListActivity
 import ee.ioc.phon.android.speak.provider.Grammar
@@ -43,15 +43,33 @@ abstract class AbstractRecognizerDemoActivity : AppCompatActivity() {
 
 
     private val grammarName: String?
-        get() = Utils.idToValue(this, Grammar.Columns.CONTENT_URI, Grammar.Columns._ID, Grammar.Columns.NAME, mGrammarId)
+        get() = Utils.idToValue(
+            this,
+            Grammar.Columns.CONTENT_URI,
+            Grammar.Columns._ID,
+            Grammar.Columns.NAME,
+            mGrammarId
+        )
 
 
     private val grammarUrl: String?
-        get() = Utils.idToValue(this, Grammar.Columns.CONTENT_URI, Grammar.Columns._ID, Grammar.Columns.URL, mGrammarId)
+        get() = Utils.idToValue(
+            this,
+            Grammar.Columns.CONTENT_URI,
+            Grammar.Columns._ID,
+            Grammar.Columns.URL,
+            mGrammarId
+        )
 
 
     private val grammarTargetLang: String?
-        get() = Utils.idToValue(this, Grammar.Columns.CONTENT_URI, Grammar.Columns._ID, Grammar.Columns.LANG, mGrammarId)
+        get() = Utils.idToValue(
+            this,
+            Grammar.Columns.CONTENT_URI,
+            Grammar.Columns._ID,
+            Grammar.Columns.LANG,
+            mGrammarId
+        )
 
     protected abstract fun onSuccess(intent: Intent?)
 
@@ -65,7 +83,8 @@ abstract class AbstractRecognizerDemoActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.menuDemoGrammarAssign -> {
-                val intent = Intent(this@AbstractRecognizerDemoActivity, GrammarListActivity::class.java)
+                val intent =
+                    Intent(this@AbstractRecognizerDemoActivity, GrammarListActivity::class.java)
                 startActivityForResult(intent, ACTIVITY_SELECT_GRAMMAR_URL)
                 return true
             }
@@ -94,6 +113,7 @@ abstract class AbstractRecognizerDemoActivity : AppCompatActivity() {
         }
     }
 
+    @Deprecated("TODO: add a better message")
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == ACTIVITY_SELECT_GRAMMAR_URL) {
             if (resultCode != AppCompatActivity.RESULT_OK) {
@@ -104,8 +124,18 @@ abstract class AbstractRecognizerDemoActivity : AppCompatActivity() {
                 toast(getString(R.string.errorFailedGetGrammarUrl))
             } else {
                 mGrammarId = java.lang.Long.parseLong(grammarUri.pathSegments[1])
-                toast(String.format(getString(R.string.toastAssignGrammar),
-                        Utils.idToValue(this, Grammar.Columns.CONTENT_URI, Grammar.Columns._ID, Grammar.Columns.NAME, mGrammarId)))
+                toast(
+                    String.format(
+                        getString(R.string.toastAssignGrammar),
+                        Utils.idToValue(
+                            this,
+                            Grammar.Columns.CONTENT_URI,
+                            Grammar.Columns._ID,
+                            Grammar.Columns.NAME,
+                            mGrammarId
+                        )
+                    )
+                )
             }
         } else if (requestCode == VOICE_RECOGNITION_REQUEST_CODE) {
             if (resultCode == AppCompatActivity.RESULT_OK) {

diff --git a/build.gradle b/build.gradle
@@ -4,8 +4,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.3.1'
-        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0'
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,4 @@
-android.enableJetifier=true
+android.enableJetifier=false
 android.useAndroidX=true
-org.gradle.jvmargs=-Xmx2560m
+org.gradle.jvmargs=-Xmx2560m
+org.gradle.unsafe.configuration-cache=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/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-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
diff --git a/speechutils b/speechutils