From 48449b6e01a492e9b6cc1cbad2ac4f7a439018ba Mon Sep 17 00:00:00 2001 From: Konstantin Kulikov Date: Thu, 13 Jul 2023 19:38:18 +0300 Subject: [PATCH 1/6] Update README.md --- README.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index ad5cbb9..557ae53 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,6 @@ This application does not share your personal data or geolocation, all work is o
- + - - + From 4154596edb18cb19587c2686361f3caf6283e761 Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Mon, 18 Dec 2023 19:56:44 +0200 Subject: [PATCH 2/6] Update target sdk version --- app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9880dda..aa5065a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,13 +12,13 @@ apply { } android { - compileSdkVersion(33) + compileSdk = 34 namespace = "f.cking.software" defaultConfig { applicationId = "f.cking.software" minSdk = 29 - targetSdk = 33 + targetSdk = 34 versionCode = (System.currentTimeMillis() / 1000).toInt() versionName = "0.18.1-beta" From 65dacfe9b46d55d49b93e3d0246ea1bb44a25081 Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Mon, 18 Dec 2023 20:33:43 +0200 Subject: [PATCH 3/6] Migrate lib versions --- app/build.gradle.kts | 19 ++++++------- .../java/f/cking/software/ui/MainActivity.kt | 2 ++ build.gradle.kts | 1 + gradle/libs.versions.toml | 27 ++++++++++--------- gradle/wrapper/gradle-wrapper.properties | 5 ++-- 5 files changed, 30 insertions(+), 24 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index aa5065a..73bf899 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -5,8 +5,14 @@ import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties plugins { id("com.android.application") id("org.jetbrains.kotlin.android") - id("kotlin-kapt") + id("com.google.devtools.ksp") + id("androidx.room") } + +room { + schemaDirectory("$projectDir/schemas") +} + apply { plugin("kotlinx-serialization") } @@ -24,12 +30,6 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" - kapt { - arguments { - arg("room.schemaLocation", "$projectDir/schemas") - } - } - buildConfigField("String", "REPORT_ISSUE_URL", "\"https://github.com/Semper-Viventem/MetaRadar/issues\"") buildConfigField("String", "DISTRIBUTION", "\"Not specified\"") @@ -95,6 +95,7 @@ android { buildFeatures.apply { compose = true + buildConfig = true } composeOptions { @@ -149,7 +150,7 @@ dependencies { // room implementation(libs.room.runtime) annotationProcessor(libs.room.ksp) - kapt(libs.room.ksp) + ksp(libs.room.ksp) // di implementation(libs.dagger) @@ -165,5 +166,5 @@ dependencies { // tests testImplementation(libs.junit) - androidTestImplementation("androidx.test.ext:junit:1.1.4") + androidTestImplementation(libs.ktx.testing) } \ No newline at end of file diff --git a/app/src/main/java/f/cking/software/ui/MainActivity.kt b/app/src/main/java/f/cking/software/ui/MainActivity.kt index 94b7dce..3abc2bf 100644 --- a/app/src/main/java/f/cking/software/ui/MainActivity.kt +++ b/app/src/main/java/f/cking/software/ui/MainActivity.kt @@ -74,11 +74,13 @@ class MainActivity : AppCompatActivity() { permissionHelper.onPermissionGranted(requestCode, permissions, grantResults) } + @Deprecated("Deprecated in Java") override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { super.onActivityResult(requestCode, resultCode, data) intentHelper.handleActivityResult(requestCode, resultCode, data) } + @Deprecated("Deprecated in Java") override fun onBackPressed() { router.navigate(BackCommand) } diff --git a/build.gradle.kts b/build.gradle.kts index a1f9888..61b5298 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,4 +4,5 @@ plugins { alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.kotlin.serialization) apply false alias(libs.plugins.kotlin.ksp) apply false + alias(libs.plugins.room) apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index aa5e78e..9d1faa7 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] # You also need to bump the version of ksp, anvil, compose -kotlin-general = "1.8.10" -kotlinx = "1.6.4" -ksp = "1.7.20-1.0.6" +kotlin-general = "1.9.21" +kotlinx = "1.7.3" +ksp = "1.9.21-1.0.16" anvil = "2.4.2" -android-gradle = "7.4.2" +android-gradle = "8.2.0" protobuf = "3.21.7" protobuf-gradle = "0.9.1" # Protobuf JVM library https://github.com/flipperdevices/flipperzero-protobuf-jvm protobuf-jvm = "0.12.0-0.3.0" -compose = "1.2.1" +compose = "1.5.4" compose-wear = "1.0.2" -compose-compiler = "1.4.4" +compose-compiler = "1.5.6" compose-accompanist = "0.28.0" compose-constraint = "1.0.1" compose-navigation = "2.5.2" @@ -21,7 +21,7 @@ wear = "1.2.0" wear-gms = "18.0.0" wear-interaction-phone = "1.1.0-alpha03" wear-interaction-remote = "1.0.0" -room = "2.4.3" +room = "2.6.1" dagger = "2.44" timber = "5.0.1" timber-treessence = "1.0.5" @@ -30,10 +30,10 @@ sentry-gradle = "3.2.0" zip4j = "2.11.2" seismic = "1.0.3" cicerone = "7.1" -ktx = "1.9.0" -ktx-fragment = "1.5.3" -ktx-activity = "1.6.0" -ktx-testing = "1.1.3" +ktx = "1.12.0" +ktx-fragment = "1.6.2" +ktx-activity = "1.8.2" +ktx-testing = "1.1.5" lifecycle = "2.5.1" # https://github.com/vigna/fastutil/issues/136 fastutil = "7.2.1" @@ -66,7 +66,7 @@ compose-dialogs = "0.9.0" process-phoenix = "2.1.2" # Testing -junit = "4.12" +junit = "4.13.2" mockito = "4.0.0" roboelectric = "4.9" mockk = "1.13.2" @@ -241,10 +241,11 @@ map = { module = "org.osmdroid:osmdroid-android", version.ref = "map" } [plugins] android-app = { id = "com.android.application", version.ref = "android-gradle" } android-lib = { id = "com.android.library", version.ref = "android-gradle" } -detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-general" } kotlin-ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin-general" } +room = { id = "androidx.room", version.ref = "room" } ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" } protobuf = { id = "com.google.protobuf", version.ref = "protobuf-gradle" } square-anvil = { id = "com.squareup.anvil", version.ref = "anvil" } +detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5ff2e60..0405be7 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ +#Mon Dec 18 19:58:11 EET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists From b8a8101b457b56590101ec9fd8c14ecd0bf27ca8 Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Mon, 18 Dec 2023 20:34:32 +0200 Subject: [PATCH 4/6] Update the app version --- app/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 73bf899..9b505a5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -26,7 +26,7 @@ android { minSdk = 29 targetSdk = 34 versionCode = (System.currentTimeMillis() / 1000).toInt() - versionName = "0.18.1-beta" + versionName = "0.19.0-beta" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" From 78fcecc7d824ad0521b85b95357f9c7d2ad1be0f Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Mon, 18 Dec 2023 20:42:21 +0200 Subject: [PATCH 5/6] Update javahome --- .github/workflows/build_check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_check.yml b/.github/workflows/build_check.yml index c899e29..68a7330 100644 --- a/.github/workflows/build_check.yml +++ b/.github/workflows/build_check.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle From 65069b99ffa0ac27c92d983a96549226dc500935 Mon Sep 17 00:00:00 2001 From: Semper-Viventem Date: Mon, 18 Dec 2023 20:49:26 +0200 Subject: [PATCH 6/6] Use Java 17 --- .github/workflows/publish_debug.yml | 4 ++-- .github/workflows/publish_release.yml | 4 ++-- app/build.gradle.kts | 12 +++++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish_debug.yml b/.github/workflows/publish_debug.yml index a7dc544..4210910 100644 --- a/.github/workflows/publish_debug.yml +++ b/.github/workflows/publish_debug.yml @@ -12,10 +12,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index e6cefc6..2ca6954 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -13,10 +13,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: set up JDK 11 + - name: set up JDK 17 uses: actions/setup-java@v3 with: - java-version: '11' + java-version: '17' distribution: 'temurin' cache: gradle diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 9b505a5..baefd20 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,5 +1,3 @@ -@file:Suppress("UnstableApiUsage") - import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties plugins { @@ -85,12 +83,16 @@ android { } compileOptions { - sourceCompatibility(JavaVersion.VERSION_1_8) - targetCompatibility(JavaVersion.VERSION_1_8) + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + kotlin { + jvmToolchain(17) } kotlinOptions { - jvmTarget = "1.8" + jvmTarget = "17" } buildFeatures.apply {