seemoo-lab
diff --git a/‎.github/workflows/android.yml‎
Lines changed: 3 additions & 3 deletions b/‎.github/workflows/android.yml‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎api.properties‎
Lines changed: 1 addition & 1 deletion b/‎api.properties‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎app/build.gradle‎
Lines changed: 32 additions & 19 deletions b/‎app/build.gradle‎
Lines changed: 32 additions & 19 deletions
diff --git a/‎app/proguard-rules.pro‎
Lines changed: 12 additions & 5 deletions b/‎app/proguard-rules.pro‎
Lines changed: 12 additions & 5 deletions
@@ -12,11 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Set up JDK 17 with Gradle cache
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21 with Gradle cache
+        uses: actions/setup-java@v4
         with:
+          java-version: 21
           distribution: temurin
-          java-version: 17
           cache: gradle
 
       - name: Grant execute permission for Gradle wrapper
 
@@ -1,2 +1,2 @@
-API_KEY="bcNVTRDK.CtBt37pbZMZnMyZa3Vtb9ot23Q73TvJz"
+API_KEY="ZKpHA5D3.93jD8IMBSeZW0mRI6815RTHlPkOLzWBx"
 API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"
@@ -2,9 +2,8 @@ import java.util.regex.Pattern
 
 plugins {
     id 'com.android.application'
-    id 'kotlin-android'
+    id 'com.android.legacy-kapt'
     id 'androidx.navigation.safeargs.kotlin'
-    id 'kotlin-kapt'
     id 'com.google.devtools.ksp'
     id 'dagger.hilt.android.plugin'
     id 'com.mikepenz.aboutlibraries.plugin.android'
@@ -16,22 +15,29 @@ def apiPropertiesFile = rootProject.file("api.properties")
 def apiProperties = new Properties()
 apiProperties.load(new FileInputStream(apiPropertiesFile))
 
+kotlin {
+    jvmToolchain {
+        languageVersion.set(JavaLanguageVersion.of(21))
+    }
+}
+
 android {
     buildFeatures {
         viewBinding true
         dataBinding true
         compose true
         buildConfig true
+        resValues true
     }
 
     compileSdk = 36
 
     defaultConfig {
         applicationId "de.seemoo.at_tracking_detection"
-        minSdkVersion 28
+        minSdk = 28
         targetSdk = 36
-        versionCode 59
-        versionName "2.7.1"
+        versionCode 63
+        versionName "3.0.1"
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
 
@@ -56,13 +62,16 @@ android {
             resValue "bool", "debug", "true"
         }
     }
+    testOptions {
+        unitTests.all {
+            it.failOnNoDiscoveredTests = false
+        }
+    }
+
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
-    }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 
     sourceSets {
@@ -98,13 +107,13 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'com.github.bastienpaulfr:Treessence:1.1.2'
     implementation "androidx.work:work-runtime-ktx:$work_version"
-    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.core:core-ktx:1.18.0'
     implementation 'androidx.appcompat:appcompat:1.7.1'
     implementation 'com.google.android.material:material:1.13.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
     implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.6'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.9.6'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.9.7'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.9.7'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.10.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.10.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -114,14 +123,14 @@ dependencies {
     implementation "androidx.profileinstaller:profileinstaller:1.4.1"
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0'
 
-    implementation "androidx.activity:activity-ktx:1.12.1"
+    implementation "androidx.activity:activity-ktx:1.13.0"
     implementation 'com.squareup.retrofit2:retrofit:3.0.0'
     implementation 'com.squareup.retrofit2:converter-gson:3.0.0'
     implementation 'com.squareup.okhttp3:okhttp:5.3.2'
     implementation 'com.squareup.okhttp3:logging-interceptor:5.3.2'
     implementation 'com.google.code.gson:gson:2.13.2'
     implementation "androidx.work:work-testing:$work_version"
-    implementation 'androidx.core:core-ktx:1.17.0'
+    implementation 'androidx.core:core-ktx:1.18.0'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.3.2'
 
     implementation "com.google.dagger:hilt-android:$hilt_compiler_version"
@@ -168,21 +177,25 @@ dependencies {
 
     //Compose
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.12.1'
+    implementation 'androidx.activity:activity-compose:1.13.0'
     // Compose Material3 Design
     implementation 'androidx.compose.material3:material3:1.4.0'
     implementation 'androidx.compose.material3:material3-window-size-class:1.4.0'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.10.0'
+    implementation 'androidx.compose.animation:animation:1.10.5'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.10.0'
+    implementation 'androidx.compose.ui:ui-tooling:1.10.5'
     // Integration with ViewModels
     implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.10.0'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.10.0'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.10.5'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"
 
+    // needed for correct dependency injection
+    implementation 'androidx.concurrent:concurrent-futures:1.3.0'
+    implementation 'androidx.concurrent:concurrent-futures-ktx:1.3.0'
+
     // Google Review Handling (only active in Google Play Builds done from the googlePlyStore Branch)
     // implementation("com.google.android.play:review:2.0.2")
     // implementation("com.google.android.play:review-ktx:2.0.2")
 
@@ -89,11 +89,18 @@
 -keep class com.google.gson.stream.JsonReader { *; }
 -keep class com.google.gson.stream.JsonWriter { *; }
 
-# Ensure that the classes related to Article are not stripped
--keep class de.seemoo.at_tracking_detection.ui.dashboard.Article { *; }
-
 # Keep ProGuard/R8 from stripping out important methods or classes
--keep class * implements com.google.gson.reflect.TypeToken { *; }
+# TypeToken is a class (not an interface), so use 'extends' not 'implements'.
+# Also preserve generic signatures so Gson can read the type parameter at runtime.
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep class * extends com.google.gson.reflect.TypeToken { *; }
+
+# Keep Article data class used for Gson deserialization in DashboardRiskFragment
+-keep class de.seemoo.at_tracking_detection.ui.dashboard.Article { *; }
+-keepclassmembers class de.seemoo.at_tracking_detection.ui.dashboard.Article {
+    <fields>;
+    <init>(...);
+}
 
 # Ensure that the DeviceType class is not stripped or obfuscated
 -keep class de.seemoo.at_tracking_detection.database.models.device.DeviceType { *; }
@@ -121,7 +128,7 @@
 -keep class de.seemoo.at_tracking_detection.util.SharedPrefs { *; }
 
 # Keep Gson annotations
--keepattributes Signature,RuntimeVisibleAnnotations
+-keepattributes Signature, InnerClasses, EnclosingMethod, RuntimeVisibleAnnotations
 
 # Keep all data classes with Gson annotations
 -keep class de.seemoo.at_tracking_detection.database.relations.** { *; }
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-API_KEY="bcNVTRDK.CtBt37pbZMZnMyZa3Vtb9ot23Q73TvJz"`
	`1`	`+API_KEY="ZKpHA5D3.93jD8IMBSeZW0mRI6815RTHlPkOLzWBx"`
`2`	`2`	`API_BASE_ADDRESS="https://tpe.seemoo.tu-darmstadt.de/api/"`