Merge pull request #145 from seemoo-lab/development

Version 2.1
seemoo-lab · Oct 20, 2023 · 351081d · 351081d
2 parents 70f031e + 59a201b
commit 351081d
Show file tree

Hide file tree

Showing 150 changed files with 3,917 additions and 400 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,15 +5,14 @@ plugins {
     id 'kotlin-kapt'
     id 'dagger.hilt.android.plugin'
     id 'com.mikepenz.aboutlibraries.plugin'
+    id 'org.jetbrains.kotlin.android'
 }
 
 def apiPropertiesFile = rootProject.file("api.properties")
 def apiProperties = new Properties()
 apiProperties.load(new FileInputStream(apiPropertiesFile))
 
 android {
-    compileSdkVersion 33
-
     buildFeatures {
         viewBinding true
         dataBinding true
@@ -22,10 +21,11 @@ android {
 
     defaultConfig {
         applicationId "de.seemoo.at_tracking_detection"
-        minSdkVersion 21
-        targetSdkVersion 31
-        versionCode 37
-        versionName "2.0"
+        minSdkVersion 28
+        targetSdkVersion 33
+        compileSdk 33
+        versionCode 38
+        versionName "2.1"
 
         buildConfigField "String", "API_KEY", apiProperties["API_KEY"]
         buildConfigField "String", "API_BASE_ADDRESS", apiProperties["API_BASE_ADDRESS"]
@@ -56,15 +56,15 @@ android {
     }
     compileOptions {
         coreLibraryDesugaringEnabled true
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_11.toString()
+        jvmTarget = JavaVersion.VERSION_17.toString()
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion "1.2.0-beta02"
+        kotlinCompilerExtensionVersion "1.4.8"
     }
 
 
@@ -91,26 +91,27 @@ dependencies {
 
     implementation 'com.jakewharton.timber:timber:5.0.1'
     implementation 'com.github.bastienpaulfr:Treessence:1.0.0'
-    implementation 'androidx.work:work-runtime-ktx:2.8.0'
-    implementation 'androidx.core:core-ktx:1.9.0'
+    implementation 'androidx.work:work-runtime-ktx:2.8.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.5.3'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.1'
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1'
-    implementation 'androidx.preference:preference-ktx:1.2.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.6.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.6.0'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.6.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1'
+    implementation 'androidx.preference:preference-ktx:1.2.1'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
 
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.5'
-    implementation 'com.google.code.gson:gson:2.9.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.work:work-testing:2.8.0'
+    implementation 'androidx.work:work-testing:2.8.1'
+    implementation 'androidx.core:core-ktx:1.10.1'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.5'
 
     implementation "com.google.dagger:hilt-android:$hilt_version"
@@ -119,11 +120,13 @@ dependencies {
 
     implementation 'com.github.AppIntro:AppIntro:6.1.0'
 
-    implementation 'org.osmdroid:osmdroid-android:6.1.11'
+    implementation 'org.osmdroid:osmdroid-android:6.1.16'
 
     implementation 'com.github.ybq:Android-SpinKit:1.4.0'
 
-    implementation 'com.mikepenz:aboutlibraries:8.9.3'
+    implementation "com.mikepenz:aboutlibraries:$about_libraries_version"
+
+    implementation 'io.noties.markwon:core:4.6.2'
 
 
     kapt "com.google.dagger:hilt-compiler:$hilt_version"
@@ -135,32 +138,32 @@ dependencies {
 
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
-    androidTestImplementation "androidx.room:room-testing:2.5.0"
-    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4'
+    androidTestImplementation 'androidx.room:room-testing:2.5.2'
+    androidTestImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3'
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:core-ktx:1.5.0'
     androidTestImplementation 'androidx.test.ext:junit-ktx:1.1.5'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.5.1'
 
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.3'
 
     //Finds memory leaks while running the app in Debug mode
 //    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.8.1'
 
     //Compose
     // Integration with activities
-    implementation 'androidx.activity:activity-compose:1.6.1'
+    implementation 'androidx.activity:activity-compose:1.7.2'
     // Compose Material Design
-    implementation 'androidx.compose.material:material:1.3.1'
+    implementation 'androidx.compose.material:material:1.4.3'
     // Animations
-    implementation 'androidx.compose.animation:animation:1.3.3'
+    implementation 'androidx.compose.animation:animation:1.4.3'
     // Tooling support (Previews, etc.)
-    implementation 'androidx.compose.ui:ui-tooling:1.3.3'
+    implementation 'androidx.compose.ui:ui-tooling:1.4.3'
     // Integration with ViewModels
-    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1'
     // UI Tests
-    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.3.3'
+    androidTestImplementation 'androidx.compose.ui:ui-test-junit4:1.4.3'
     // When using a MDC theme
     implementation "com.google.android.material:compose-theme-adapter:1.2.1"