Migrate to API 13 (Android 12)

Upgrade test dependencies
onaio · Jul 25, 2024 · 763a74d · 763a74d
1 parent 388f94e
commit 763a74d
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 20 deletions.
diff --git a/configs.gradle b/configs.gradle
@@ -104,17 +104,16 @@ ext {
 
     // Dependency and other versions
     androidxTestCoreVersion = "1.4.0"
-    buildToolsVersion = "30.0.3"
-    compileSdkVersion = 30
-    jacocoVersion = "0.8.8"
-    junitVersion = "4.12"
+    compileSdkVersion = 34
+    jacocoVersion = "0.8.11"
+    junitVersion = "4.13.2"
     mapboxAnnotationPluginVersion = "0.9.0"
     mapboxSdkVersion = "9.7.1"
-    robolectricShadowsMultidexVersion = "4.7.3"
-    robolectricVersion = "4.7.3"
+    robolectricShadowsMultidexVersion = "4.13"
+    robolectricVersion = "4.13"
     supportVersion = "1.0.0"
     volleyVersion = "1.2.0"
-    targetSdkVersion = 27
+    targetSdkVersion = 34
 
     // Dependency names
     androidxTestCore = "androidx.test:core:$androidxTestCoreVersion"

diff --git a/gradle.properties b/gradle.properties
@@ -32,7 +32,7 @@ POM_SETTING_DEVELOPER_NAME=OpenSRP Onadev
 android.useAndroidX=true
 android.enableJetifier=true
 
-android.jetifier.ignorelist=shadows,bcprov-jdk15on
+android.jetifier.ignorelist=shadows,bcprov-jdk18on
 #android.jetifier.blacklist=shadows,bcprov-jdk15on
 
 # android.debug.obsoleteApi=true

diff --git a/library/build.gradle b/library/build.gradle
@@ -25,8 +25,7 @@ jacoco {
 
 android {
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -146,12 +145,15 @@ private static void testDependencies(instance, configuration) {
     configuration.testImplementation instance.robolectric
     configuration.testImplementation instance.robolectricShadowsMultidex
 
-    configuration.testImplementation 'org.mockito:mockito-inline:2.25.0'
+    configuration.testImplementation 'org.mockito:mockito-inline:5.2.0'
 
     configuration.testImplementation instance.androidxTestCore
     configuration.androidTestImplementation instance.junit
-    configuration.androidTestImplementation 'org.mockito:mockito-android:2.7.22'
-    configuration.androidTestImplementation 'org.mockito:mockito-core:2.7.22'
+
+    def mockitoVersion = '5.12.0'
+
+    configuration.androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
+    configuration.androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"
     configuration.androidTestImplementation ('com.android.support.test.espresso:espresso-core:3.1.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
         exclude group: 'net.sf.kxml', module: 'kxml2'

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     package="io.ona.kujaku">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
@@ -24,7 +25,7 @@
         <service android:name=".services.TrackingService"
             android:label="Tracking Service">
         </service>
-        <receiver android:name=".receivers.KujakuNetworkChangeReceiver">
+        <receiver android:name=".receivers.KujakuNetworkChangeReceiver" android:exported="true">
             <intent-filter>
                 <action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED"/>

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -8,8 +8,7 @@ jacoco {
 
 android {
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -20,7 +20,8 @@
         <activity
             android:name=".activities.MainActivity"
             android:theme="@style/AppTheme.NoActionBar"
-            android:windowSoftInputMode="stateAlwaysHidden">
+            android:windowSoftInputMode="stateAlwaysHidden"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -108,4 +109,4 @@
         </activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/utils/build.gradle b/utils/build.gradle
@@ -13,8 +13,7 @@ jacoco {
 
 android {
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8