Merge pull request #60 from Semper-Viventem/master

Release 0.19.0-beta
Semper-Viventem · Dec 18, 2023 · 56a29c2 · 56a29c2
2 parents 97e1c32 + 3e0c7ff
commit 56a29c2
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 41 deletions.
diff --git 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
 

diff --git 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
@@ -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/README.md b/README.md
@@ -10,7 +10,6 @@ This application does not share your personal data or geolocation, all work is o
 
 <br>
 
-<img src='https://user-images.githubusercontent.com/18288554/221911079-945d912d-8efa-4d96-90d9-bc32e98114b7.jpg' width='300'/> <img src='https://user-images.githubusercontent.com/18288554/221911329-89d96c0c-124e-4ac9-9234-4cb530e95288.jpg' width='300'/>
+<img src='https://github.com/Semper-Viventem/MetaRadar/assets/18288554/1ed51c54-5c99-43a5-af00-b8e758430245' width='300'/> <img src='https://github.com/Semper-Viventem/MetaRadar/assets/18288554/d5154621-a66a-4bb2-8099-d1d2c27503df' width='300'/>
 
-
-<img src='https://user-images.githubusercontent.com/18288554/221911481-8178dd65-7147-462b-bc0d-5c2bb4e2859c.jpg' width='300'/> <img src='https://user-images.githubusercontent.com/18288554/221911491-f9bca86f-a0d8-48cc-95be-24343fc582f4.jpg' width='300'/>
+<img src='https://github.com/Semper-Viventem/MetaRadar/assets/18288554/8a59cc0d-ccc8-47c0-a1d3-3a08f8ff347a' width='300'/> <img src='https://github.com/Semper-Viventem/MetaRadar/assets/18288554/6e51793a-00ce-4e4b-9e59-c69973cde6a2' width='300'/>
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,35 +1,33 @@
-@file:Suppress("UnstableApiUsage")
-
 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")
 }
 
 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"
+        versionName = "0.19.0-beta"
 
         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\"")
@@ -85,16 +83,21 @@ 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 {
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
@@ -149,7 +152,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 +168,5 @@ dependencies {
 
     // tests
     testImplementation(libs.junit)
-    androidTestImplementation("androidx.test.ext:junit:1.1.4")
+    androidTestImplementation(libs.ktx.testing)
 }
diff --git 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
@@ -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
@@ -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
@@ -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