Fix sdk inconsistencies

MobileNativeFoundation · Jul 7, 2024 · 2da9d8f · 2da9d8f
1 parent e9d2423
commit 2da9d8f
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-androidMinSdk = "24"
+androidMinSdk = "31"
 androidCompileSdk = "33"
 androidGradlePlugin = "7.4.2"
 androidTargetSdk = "33"

diff --git a/paging/build.gradle.kts b/paging/build.gradle.kts
@@ -60,11 +60,11 @@ android {
     namespace = "org.mobilenativefoundation.store.paging5"
 
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    compileSdk = 33
+    compileSdk = 34
 
     defaultConfig {
-        minSdk = 24
-        targetSdk = 33
+        minSdk = 31
+        targetSdk = 34
     }
 
     lint {

diff --git a/paging/kover/coverage.xml b/paging/kover/coverage.xml
@@ -1,6 +1,22 @@
 <?xml version="1.0" ?>
 <report name="Intellij Coverage Report">
 <package name="org/mobilenativefoundation/store/paging5">
+<class name="org/mobilenativefoundation/store/paging5/BuildConfig" sourcefilename="BuildConfig.java">
+<method name="&lt;clinit&gt;" desc="()V">
+<counter type="INSTRUCTION" missed="3" covered="0"/>
+<counter type="BRANCH" missed="0" covered="0"/>
+<counter type="LINE" missed="1" covered="0"/>
+</method>
+<method name="&lt;init&gt;" desc="()V">
+<counter type="INSTRUCTION" missed="2" covered="0"/>
+<counter type="BRANCH" missed="0" covered="0"/>
+<counter type="LINE" missed="1" covered="0"/>
+</method>
+<counter type="INSTRUCTION" missed="5" covered="0"/>
+<counter type="BRANCH" missed="0" covered="0"/>
+<counter type="LINE" missed="2" covered="0"/>
+<counter type="METHOD" missed="2" covered="0"/>
+</class>
 <class name="org/mobilenativefoundation/store/paging5/LaunchPagingStoreKt" sourcefilename="LaunchPagingStore.kt">
 <method name="launchPagingStore$lambda$1" desc="(Lorg/mobilenativefoundation/store/store5/MutableStore;Lorg/mobilenativefoundation/store/core5/StoreKey;)Lkotlinx/coroutines/flow/Flow;">
 <counter type="INSTRUCTION" missed="0" covered="8"/>
@@ -260,6 +276,13 @@
 <counter type="LINE" missed="0" covered="1"/>
 <counter type="METHOD" missed="0" covered="1"/>
 </class>
+<sourcefile name="BuildConfig.java">
+<line nr="6" mi="2" ci="0" mb="0" cb="0"/>
+<line nr="7" mi="3" ci="0" mb="0" cb="0"/>
+<counter type="INSTRUCTION" missed="5" covered="0"/>
+<counter type="BRANCH" missed="0" covered="0"/>
+<counter type="LINE" missed="2" covered="0"/>
+</sourcefile>
 <sourcefile name="LaunchPagingStore.kt">
 <line nr="21" mi="0" ci="2" mb="0" cb="0"/>
 <line nr="36" mi="0" ci="3" mb="0" cb="0"/>
@@ -426,11 +449,11 @@
 <counter type="BRANCH" missed="11" covered="11"/>
 <counter type="LINE" missed="0" covered="119"/>
 </sourcefile>
-<counter type="INSTRUCTION" missed="41" covered="1702"/>
+<counter type="INSTRUCTION" missed="46" covered="1702"/>
 <counter type="BRANCH" missed="17" covered="27"/>
-<counter type="LINE" missed="2" covered="154"/>
-<counter type="METHOD" missed="2" covered="27"/>
-<counter type="CLASS" missed="0" covered="19"/>
+<counter type="LINE" missed="4" covered="154"/>
+<counter type="METHOD" missed="4" covered="27"/>
+<counter type="CLASS" missed="1" covered="19"/>
 </package>
 <package name="org/mobilenativefoundation/store/paging5/util">
 <class name="org/mobilenativefoundation/store/paging5/util/FakePostApi" sourcefilename="FakePostApi.kt">
@@ -1043,10 +1066,10 @@
 <counter type="METHOD" missed="13" covered="37"/>
 <counter type="CLASS" missed="11" covered="18"/>
 </package>
-<counter type="INSTRUCTION" missed="284" covered="2284"/>
+<counter type="INSTRUCTION" missed="289" covered="2284"/>
 <counter type="BRANCH" missed="45" covered="50"/>
-<counter type="LINE" missed="39" covered="257"/>
-<counter type="METHOD" missed="15" covered="64"/>
-<counter type="CLASS" missed="11" covered="37"/>
+<counter type="LINE" missed="41" covered="257"/>
+<counter type="METHOD" missed="17" covered="64"/>
+<counter type="CLASS" missed="12" covered="37"/>
 </report>
 
diff --git a/...c/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt b/...c/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt
@@ -24,11 +24,11 @@ class AndroidConventionPlugin : Plugin<Project> {
 
         extensions.configure<LibraryExtension> {
 
-            compileSdk = 33
+            compileSdk = 34
 
             defaultConfig {
-                minSdk = 24
-                targetSdk = 33
+                minSdk = 31
+                targetSdk = 34
             }
 
             lint {