From ad9ff4a64d2ac5fcbf29d5e7e0452c0384fe59c1 Mon Sep 17 00:00:00 2001 From: Kenneth Date: Tue, 1 Aug 2023 00:27:59 +0100 Subject: [PATCH 1/3] Upgrade gradle & pin androidx core version --- build.gradle | 2 +- datastore-preferences/build.gradle | 4 ++-- gradle/wrapper/gradle-wrapper.properties | 2 +- wifi-control-module/build.gradle | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 49311366..185deba7 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.2' + classpath 'com.android.tools.build:gradle:7.4.2' classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10' classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version" classpath "com.google.dagger:hilt-android-gradle-plugin:$hilt_version" diff --git a/datastore-preferences/build.gradle b/datastore-preferences/build.gradle index b4cd9bbd..bcf2c18f 100644 --- a/datastore-preferences/build.gradle +++ b/datastore-preferences/build.gradle @@ -31,11 +31,11 @@ android { dependencies { - implementation 'androidx.core:core-ktx:1.7.0' + implementation 'androidx.core:core-ktx:1.9.0' implementation 'androidx.appcompat:appcompat:1.5.0' implementation 'com.google.android.material:material:1.6.1' implementation 'androidx.preference:preference-ktx:1.2.0' - implementation 'androidx.core:core-ktx:+' + implementation 'androidx.core:core-ktx:1.9.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 23402d00..d535e8f4 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-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip diff --git a/wifi-control-module/build.gradle b/wifi-control-module/build.gradle index 93ea2a4a..c6213e26 100644 --- a/wifi-control-module/build.gradle +++ b/wifi-control-module/build.gradle @@ -40,7 +40,7 @@ dependencies { implementation 'androidx.core:core-ktx:1.8.0' implementation 'androidx.appcompat:appcompat:1.4.2' implementation 'com.google.android.material:material:1.6.1' - implementation 'androidx.core:core-ktx:+' + implementation 'androidx.core:core-ktx:1.9.0' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' From 04e30d2dadb34e88c22c1843faf68a7e17ff9d7e Mon Sep 17 00:00:00 2001 From: Kenneth Date: Tue, 1 Aug 2023 00:33:03 +0100 Subject: [PATCH 2/3] Internal version bump --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 0e9103ca..5351bbb8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "kenneth.app.starlightlauncher" minSdk 23 targetSdk 33 - versionCode 10033 - versionName "1.0.0-beta.7" + versionCode 10034 + versionName "1.0.0-internal.13" renderscriptTargetApi 30 renderscriptSupportModeEnabled true From d45ee142e47fc737fa8a020fab0ec0cd21b06f44 Mon Sep 17 00:00:00 2001 From: Kenneth Date: Tue, 1 Aug 2023 00:50:46 +0100 Subject: [PATCH 3/3] Bump beta 7 version code --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5351bbb8..f3c50d87 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ android { applicationId "kenneth.app.starlightlauncher" minSdk 23 targetSdk 33 - versionCode 10034 - versionName "1.0.0-internal.13" + versionCode 10035 + versionName "1.0.0-beta.7" renderscriptTargetApi 30 renderscriptSupportModeEnabled true