Update dependencies 04-2024

README.md

@@ -1,4 +1,4 @@
-![Download](https://img.shields.io/maven-central/v/com.infinum.sentinel/sentinel) ![Validate Gradle Wrapper](https://github.com/infinum/android-sentinel/workflows/Validate%20Gradle%20Wrapper/badge.svg) ![Code analysis](https://github.com/infinum/android-sentinel/workflows/Code%20analysis/badge.svg) [![CodeFactor](https://www.codefactor.io/repository/github/infinum/android-sentinel/badge/master)](https://www.codefactor.io/repository/github/infinum/android-sentinel/overview/master)
+![Download](https://img.shields.io/maven-central/v/com.infinum.sentinel/sentinel) ![Validate Gradle Wrapper](https://github.com/infinum/android-sentinel/actions/workflows/gradle-wrapper-validation.yml/badge.svg) ![Code analysis](https://github.com/infinum/android-sentinel/actions/workflows/code-analysis.yml/badge.svg) [![CodeFactor](https://www.codefactor.io/repository/github/infinum/android-sentinel/badge/master)](https://www.codefactor.io/repository/github/infinum/android-sentinel/overview/master)
 
 ### <img align="left" src="logo.svg" width="48">
 
@@ -57,15 +57,17 @@ Then add the following dependencies in your app `build.gradle` or `build.gradle.
 **Groovy**
 
 ```groovy
-debugImplementation "com.infinum.sentinel:sentinel:1.3.1"
-releaseImplementation "com.infinum.sentinel:sentinel-no-op:1.3.1"
+def sentinelVersion = "1.3.2"
+debugImplementation "com.infinum.sentinel:sentinel:$sentinelVersion"
+releaseImplementation "com.infinum.sentinel:sentinel-noop:$sentinelVersion"
 ```
 
 **KotlinDSL**
 
 ```kotlin
-debugImplementation("com.infinum.sentinel:sentinel:1.3.1")
-releaseImplementation("com.infinum.sentinel:sentinel-no-op:1.3.1")
+val sentinelVersion = "1.3.2"
+debugImplementation("com.infinum.sentinel:sentinel:$sentinelVersion")
+releaseImplementation("com.infinum.sentinel:sentinel-no-op:$sentinelVersion")
 ```
 
 Basic tools are provided inside the main package but depending on requirements you might want to add
@@ -74,27 +76,27 @@ specific tools:
 **Groovy**
 
 ```groovy
-debugImplementation "com.infinum.sentinel:tool-chucker:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-collar:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-dbinspector:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-leakcanary:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-appgallery:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-googleplay:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-thimble:1.3.1"
-debugImplementation "com.infinum.sentinel:tool-timber:1.3.1"
+debugImplementation "com.infinum.sentinel:tool-chucker:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-collar:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-dbinspector:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-leakcanary:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-appgallery:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-googleplay:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-thimble:$sentinelVersion"
+debugImplementation "com.infinum.sentinel:tool-timber:$sentinelVersion"
 ```
 
 **KotlinDSL**
 
 ```kotlin
-debugImplementation("com.infinum.sentinel:tool-chucker:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-collar:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-dbinspector:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-leakcanary:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-appgallery:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-googleplay:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-thimble:1.3.1")
-debugImplementation("com.infinum.sentinel:tool-timber:1.3.1")
+debugImplementation("com.infinum.sentinel:tool-chucker:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-collar:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-dbinspector:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-leakcanary:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-appgallery:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-googleplay:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-thimble:$sentinelVersion")
+debugImplementation("com.infinum.sentinel:tool-timber:$sentinelVersion")
 ```
 
 Now you can sync your project.

config.gradle

@@ -1,13 +1,13 @@
 ext {
     def major = 1
     def minor = 3
-    def patch = 2
+    def patch = 3
 
     buildConfig = [
             "minSdk"    : 21,
-            "compileSdk": 33,
-            "targetSdk" : 33,
-            "buildTools": "33.0.2"
+            "compileSdk": 34,
+            "targetSdk" : 34,
+            "buildTools": "34.0.0"
     ]
     releaseConfig = [
             "group"      : "com.infinum.sentinel",

gradle/libs.versions.toml

@@ -1,23 +1,23 @@
 [versions]
-sentinel = "1.3.2"
-gradle = "8.0.2"
-desugar = "2.0.3"
-kotlin = "1.8.21"
-coroutines = "1.7.1"
+sentinel = "1.3.3"
+gradle = "8.3.2"
+desugar = "2.0.4"
+kotlin = "1.9.22"
+coroutines = "1.8.0"
 json = "1.5.1"
-core = "1.10.1"
+core = "1.12.0"
 appcompat = "1.6.1"
-activity = "1.7.2"
-fragment = "1.5.7"
-recycler = "1.3.0"
-lifecycle = "2.6.1"
-preference = "1.2.0"
-room = "2.5.1"
-workmanager = "2.8.1"
+activity = "1.8.2"
+fragment = "1.6.2"
+recycler = "1.3.2"
+lifecycle = "2.7.0"
+preference = "1.2.1"
+room = "2.6.1"
+workmanager = "2.9.0"
 startup = "1.1.1"
 crypto = "1.1.0-alpha06"
 dynamicanimation = "1.0.0"
-design = "1.9.0"
+design = "1.11.0"
 inject = "0.6.1"
 timber = "5.0.1"
 detekt = "1.23.0"

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

sample/build.gradle

@@ -54,13 +54,18 @@ android {
         }
     }
 
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+    }
+
     sourceSets {
         main.java.srcDirs += "src/main/kotlin"
         release.java.srcDirs += "src/release/kotlin"
     }
 }
 
 dependencies {
+    coreLibraryDesugaring libs.desugar
     implementation libs.kotlin.core
     implementation libs.androidx.appcompat
     implementation libs.androidx.preference

sample/src/main/AndroidManifest.xml

@@ -2,9 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="false"/>
+
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.CAMERA"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
 
     <application
         android:name=".SampleApplication"
@@ -20,17 +24,17 @@
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.MAIN"/>
 
-                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
         <activity
             android:name=".JavaMainActivity"
-            android:exported="false" />
+            android:exported="false"/>
         <activity
             android:name=".BundleActivity"
-            android:exported="false" />
+            android:exported="false"/>
     </application>
 
 </manifest>

sentinel-no-op/build.gradle

@@ -10,17 +10,13 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode releaseConfig.versionCode
-        versionName releaseConfig.version
     }
 
     buildTypes {
         debug {
-            debuggable true
             minifyEnabled false
         }
         release {
-            debuggable false
             minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
         }

sentinel/build.gradle

@@ -2,7 +2,7 @@ plugins {
     id "com.android.library"
     id "kotlin-android"
     id "org.jetbrains.kotlin.plugin.serialization"
-    id "com.google.devtools.ksp" version "1.8.21-1.0.11"
+    id "com.google.devtools.ksp" version "1.9.22-1.0.17"
 }
 
 apply from: "jacoco.gradle"
@@ -14,8 +14,6 @@ android {
     defaultConfig {
         minSdkVersion buildConfig.minSdk
         targetSdkVersion buildConfig.targetSdk
-        versionCode releaseConfig.versionCode
-        versionName releaseConfig.version
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
@@ -31,11 +29,9 @@ android {
     buildTypes {
         debug {
             testCoverageEnabled true
-            debuggable true
             minifyEnabled false
         }
         release {
-            debuggable false
             minifyEnabled true
             proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.txt"
         }
@@ -104,21 +100,21 @@ dependencies {
     implementation libs.inject.runtime
 
     androidTestImplementation "junit:junit:4.13.2"
-    androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
-    androidTestImplementation "androidx.test:core-ktx:1.4.0"
-    androidTestImplementation "androidx.test:rules:1.4.0"
-    androidTestImplementation "androidx.test:runner:1.4.0"
-    androidTestImplementation "androidx.test.ext:junit:1.1.3"
-    androidTestImplementation "androidx.security:security-crypto:1.1.0-alpha03"
+    androidTestImplementation "androidx.arch.core:core-testing:2.2.0"
+    androidTestImplementation "androidx.test:core-ktx:1.5.0"
+    androidTestImplementation "androidx.test:rules:1.5.0"
+    androidTestImplementation "androidx.test:runner:1.5.2"
+    androidTestImplementation "androidx.test.ext:junit:1.1.5"
+    androidTestImplementation "androidx.security:security-crypto:1.1.0-alpha06"
     androidTestImplementation "org.robolectric:shadowapi:4.5.1"
-    androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
-    androidTestImplementation "androidx.test.espresso:espresso-intents:3.4.0"
-    androidTestImplementation "androidx.room:room-testing:2.4.0"
-    androidTestImplementation "androidx.fragment:fragment-ktx:1.4.0"
-    androidTestImplementation "androidx.fragment:fragment-testing:1.4.0"
+    androidTestImplementation "androidx.test.espresso:espresso-core:3.5.1"
+    androidTestImplementation "androidx.test.espresso:espresso-intents:3.5.1"
+    androidTestImplementation "androidx.room:room-testing:2.6.1"
+    androidTestImplementation "androidx.fragment:fragment-ktx:1.6.2"
+    androidTestImplementation "androidx.fragment:fragment-testing:1.6.2"
 
     testImplementation "junit:junit:4.13.2"
-    testImplementation "androidx.test.ext:junit:1.1.3"
+    testImplementation "androidx.test.ext:junit:1.1.5"
 }
 
 ksp {

sentinel/src/androidTest/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="com.infinum.sentinel"
     android:versionCode="100000"
     android:versionName="1.0.0">
 

sentinel/src/androidTest/kotlin/com/infinum/sentinel/data/sources/raw/collectors/CollectorsTestSuite.kt

@@ -10,6 +10,6 @@ import org.junit.runners.Suite.SuiteClasses
     DeviceCollectorTestSuite::class,
     ApplicationCollectorTests::class,
     PermissionsCollectorTests::class,
-    PreferencesCollectorTests::class
+//    PreferencesCollectorTests::class
 )
-class CollectorsTestSuite
+public class CollectorsTestSuite

sentinel/src/androidTest/kotlin/com/infinum/sentinel/data/sources/raw/collectors/DeviceCollectorDeviceTests.kt

@@ -1,9 +1,13 @@
 package com.infinum.sentinel.data.sources.raw.collectors
 
+import android.content.Context
 import android.os.Build
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import com.infinum.sentinel.data.models.raw.DeviceData
+//import com.infinum.sentinel.data.sources.raw.formatters.XmlStringBuilderTests
+import com.infinum.sentinel.ui.SentinelTestApplication
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.BeforeClass
@@ -30,6 +34,8 @@ internal class DeviceCollectorDeviceTests {
 
         lateinit var actualDeviceData: DeviceData
 
+        lateinit var context: Context
+
         @BeforeClass
         @JvmStatic
         fun setupCollector() {
@@ -69,7 +75,9 @@ internal class DeviceCollectorDeviceTests {
                 FIELD_SECURITY_PATCH
             )
 
-            val collector = DeviceCollector()
+            context = ApplicationProvider.getApplicationContext<SentinelTestApplication>().applicationContext
+
+            val collector = DeviceCollector(context)
 
             actualDeviceData = collector()
         }

sentinel/src/androidTest/kotlin/com/infinum/sentinel/data/sources/raw/collectors/DeviceCollectorEmulatorTests.kt

@@ -1,9 +1,13 @@
 package com.infinum.sentinel.data.sources.raw.collectors
 
+import android.content.Context
 import android.os.Build
+import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.filters.SmallTest
 import com.infinum.sentinel.data.models.raw.DeviceData
+//import com.infinum.sentinel.data.sources.raw.formatters.XmlStringBuilderTests
+import com.infinum.sentinel.ui.SentinelTestApplication
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertTrue
 import org.junit.BeforeClass
@@ -30,6 +34,8 @@ internal class DeviceCollectorEmulatorTests {
 
         lateinit var actualDeviceData: DeviceData
 
+        lateinit var context: Context
+
         @BeforeClass
         @JvmStatic
         fun setupCollector() {
@@ -69,7 +75,9 @@ internal class DeviceCollectorEmulatorTests {
                 FIELD_SECURITY_PATCH
             )
 
-            val collector = DeviceCollector()
+            context = ApplicationProvider.getApplicationContext<SentinelTestApplication>().applicationContext
+
+            val collector = DeviceCollector(context)
 
             actualDeviceData = collector()
         }

sentinel/src/androidTest/kotlin/com/infinum/sentinel/data/sources/raw/collectors/DeviceCollectorTestSuite.kt

@@ -6,4 +6,4 @@ import org.junit.runners.Suite.SuiteClasses
 
 @RunWith(Suite::class)
 @SuiteClasses(DeviceCollectorDeviceTests::class, DeviceCollectorEmulatorTests::class)
-class DeviceCollectorTestSuite
+public class DeviceCollectorTestSuite