diff --git a/app/build.gradle b/app/build.gradle index b5e42bcf..4961bfb8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,13 +6,13 @@ 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:1.9.20' - implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.9.24' + implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.recyclerview:recyclerview:1.3.2' // implementation 'androidx.activity:activity:1.4.0' implementation 'androidx.dynamicanimation:dynamicanimation:1.0.0' - implementation 'com.google.android.material:material:1.11.0' + implementation 'com.google.android.material:material:1.12.0' } android { @@ -26,9 +26,9 @@ android { defaultConfig { applicationId 'ee.ioc.phon.android.speak' minSdkVersion 24 - targetSdkVersion 34 - versionCode 1914 - versionName '1.9.14' + targetSdkVersion 35 + versionCode 1917 + versionName '1.9.17' vectorDrawables.useSupportLibrary = true // Keep only en and et resources resourceConfigurations += ['en', 'et'] diff --git a/app/src/main/java/ee/ioc/phon/android/speak/Log.kt b/app/src/main/java/ee/ioc/phon/android/speak/Log.kt index 0c1cae01..6f6afb26 100644 --- a/app/src/main/java/ee/ioc/phon/android/speak/Log.kt +++ b/app/src/main/java/ee/ioc/phon/android/speak/Log.kt @@ -18,8 +18,9 @@ package ee.ioc.phon.android.speak import android.util.Log object Log { + // TODO: restore = BuildConfig.DEBUG once we understand how it works @JvmField - val DEBUG = BuildConfig.DEBUG + val DEBUG = false private const val LOG_TAG = "k6nele" private const val NULL = "NULL" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c3349a84..4167b22b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,6 +3,8 @@ <style name="Theme.K6nele" parent="Theme.AppCompat.DayNight"> <item name="colorAccent">@color/accent</item> + <item name="android:windowFullscreen">false</item> + <item name="android:fitsSystemWindows">true</item> </style> <!-- diff --git a/build.gradle b/build.gradle index 0682c0c2..7d88a807 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.3.0' + classpath 'com.android.tools.build:gradle:8.7.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20' } } @@ -18,5 +18,5 @@ allprojects { } ext { - compileSdk = 34 + compileSdk = 35 } diff --git a/gradle.properties b/gradle.properties index 7941f415..5771aeb1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ -android.defaults.buildfeatures.buildconfig=true android.enableJetifier=false android.nonFinalResIds=false android.nonTransitiveRClass=false diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e1fca08e..7719dbb9 100644 --- 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-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip diff --git a/metadata/en-US/changelogs/1916.txt b/metadata/en-US/changelogs/1916.txt new file mode 100644 index 00000000..24e964d4 --- /dev/null +++ b/metadata/en-US/changelogs/1916.txt @@ -0,0 +1,2 @@ +- Improve compatibility with Android v13 and v14 +- Update dependencies diff --git a/speechutils b/speechutils index 00cd2c92..3365ec62 160000 --- a/speechutils +++ b/speechutils @@ -1 +1 @@ -Subproject commit 00cd2c9256c2da0188f38923af30985d74e8e3f4 +Subproject commit 3365ec625bb9d53bab01f341f7a17867dc621057