diff --git a/.github/workflows/.ci_test_and_publish.yml b/.github/workflows/.ci_test_and_publish.yml index 7efd980c5..55a24ede0 100644 --- a/.github/workflows/.ci_test_and_publish.yml +++ b/.github/workflows/.ci_test_and_publish.yml @@ -19,8 +19,8 @@ jobs: - name: Set up our JDK environment uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: 17 + distribution: zulu + java-version: 11 - name: Upload Artifacts run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel @@ -56,7 +56,7 @@ jobs: uses: actions/setup-java@v2 with: distribution: zulu - java-version: 17 + java-version: 11 - name: Run tests run: ./gradlew check --rerun-tasks --stacktrace - name: Upload code coverage diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 73dff3fc3..d1be31467 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -9,8 +9,8 @@ jobs: - name: Setup Java uses: actions/setup-java@v4 with: - distribution: 'temurin' - java-version: 17 + distribution: zulu + java-version: 11 - name: Setup Gradle uses: gradle/actions/setup-gradle@v3 - name: Run check with Gradle Wrapper diff --git a/README.md b/README.md index f0911f8a5..259b3b8e0 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ #### Android ```kotlin -implementation "org.mobilenativefoundation.store:store5:5.1.0-alpha03" +implementation "org.mobilenativefoundation.store:store5:5.1.0-alpha04" ``` #### Multiplatform (Common, JVM, Native, JS) @@ -42,7 +42,7 @@ implementation "org.mobilenativefoundation.store:store5:5.1.0-alpha03" ```kotlin commonMain { dependencies { - implementation("org.mobilenativefoundation.store:store5:5.1.0-alpha03") + implementation("org.mobilenativefoundation.store:store5:5.1.0-alpha04") } } ``` diff --git a/build.gradle.kts b/build.gradle.kts index c3730e65c..51f4d9ef9 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -50,13 +50,13 @@ subprojects { tasks { withType { kotlinOptions { - jvmTarget = "17" + jvmTarget = "11" } } withType().configureEach { - sourceCompatibility = JavaVersion.VERSION_17.name - targetCompatibility = JavaVersion.VERSION_17.name + sourceCompatibility = JavaVersion.VERSION_11.name + targetCompatibility = JavaVersion.VERSION_11.name } } diff --git a/cache/api/android/cache.api b/cache/api/android/cache.api index c7cdabcb3..e64d0ebd9 100644 --- a/cache/api/android/cache.api +++ b/cache/api/android/cache.api @@ -1,3 +1,10 @@ +public final class org/mobilenativefoundation/store/cache/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + public abstract interface class org/mobilenativefoundation/store/cache5/Cache { public abstract fun getAllPresent ()Ljava/util/Map; public abstract fun getAllPresent (Ljava/util/List;)Ljava/util/Map; diff --git a/core/api/android/core.api b/core/api/android/core.api index 7a452a0a2..9203b623c 100644 --- a/core/api/android/core.api +++ b/core/api/android/core.api @@ -1,3 +1,10 @@ +public final class org/mobilenativefoundation/store/core/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + public abstract interface annotation class org/mobilenativefoundation/store/core5/ExperimentalStoreApi : java/lang/annotation/Annotation { } diff --git a/gradle.properties b/gradle.properties index 6b13fd244..2b0c5b64f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ org.gradle.jvmargs=-XX:MaxMetaspaceSize=2G # POM file GROUP=org.mobilenativefoundation.store -VERSION_NAME=5.1.0-alpha03 +VERSION_NAME=5.1.0-alpha04 POM_PACKAGING=pom POM_DESCRIPTION = Store5 is a Kotlin Multiplatform network-resilient repository layer diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index dbb3af7e4..a907fda50 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] androidMinSdk = "24" androidCompileSdk = "33" -androidGradlePlugin = "8.2.2" +androidGradlePlugin = "7.4.2" androidTargetSdk = "33" atomicFu = "0.24.0" baseKotlin = "2.0.0" @@ -21,7 +21,7 @@ testCore = "1.5.0" kmmBridge = "0.3.2" ktlint = "0.39.0" kover = "0.6.0" -store = "5.1.0-alpha03" +store = "5.1.0-alpha04" truth = "1.1.3" binary-compatibility-validator = "0.15.0-Beta.2" diff --git a/multicast/api/android/multicast.api b/multicast/api/android/multicast.api index 986699944..5eadf9771 100644 --- a/multicast/api/android/multicast.api +++ b/multicast/api/android/multicast.api @@ -1,3 +1,10 @@ +public final class org/mobilenativefoundation/store/multicast/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + public final class org/mobilenativefoundation/store/multicast5/Multicaster { public fun (Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/flow/Flow;ZZLkotlin/jvm/functions/Function2;)V public synthetic fun (Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/flow/Flow;ZZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V diff --git a/paging/build.gradle.kts b/paging/build.gradle.kts index 96ca43b27..6174abdd8 100644 --- a/paging/build.gradle.kts +++ b/paging/build.gradle.kts @@ -53,18 +53,18 @@ kotlin { } } - jvmToolchain(17) + jvmToolchain(11) } android { namespace = "org.mobilenativefoundation.store.paging5" sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 24 - targetSdk = 33 + targetSdk = 34 } lint { @@ -75,8 +75,8 @@ android { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } @@ -84,7 +84,7 @@ tasks.withType().configureEach { dokkaSourceSets.configureEach { reportUndocumented.set(false) skipDeprecated.set(true) - jdkVersion.set(17) + jdkVersion.set(11) } } diff --git a/paging/kover/coverage.xml b/paging/kover/coverage.xml index 15886ada8..13254ba4c 100644 --- a/paging/kover/coverage.xml +++ b/paging/kover/coverage.xml @@ -1,6 +1,22 @@ + + + + + + + + + + + + + + + + @@ -260,6 +276,13 @@ + + + + + + + @@ -426,11 +449,11 @@ - + - - - + + + @@ -1043,10 +1066,10 @@ - + - - - + + + diff --git a/rx2/api/rx2.api b/rx2/api/rx2.api index 8c2b6797c..9a26b9d7a 100644 --- a/rx2/api/rx2.api +++ b/rx2/api/rx2.api @@ -1,3 +1,10 @@ +public final class org/mobilenativefoundation/store/rx2/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + public final class org/mobilenativefoundation/store/rx2/RxFetcherKt { public static final fun ofFlowable (Lorg/mobilenativefoundation/store/store5/Fetcher$Companion;Lkotlin/jvm/functions/Function1;)Lorg/mobilenativefoundation/store/store5/Fetcher; public static final fun ofResultFlowable (Lorg/mobilenativefoundation/store/store5/Fetcher$Companion;Lkotlin/jvm/functions/Function1;)Lorg/mobilenativefoundation/store/store5/Fetcher; diff --git a/store/api/android/store.api b/store/api/android/store.api index 9d866b708..714f8a6a4 100644 --- a/store/api/android/store.api +++ b/store/api/android/store.api @@ -14,6 +14,13 @@ public final class org/mobilenativefoundation/store/store5/Bookkeeper$DefaultImp public static synthetic fun setLastFailedSync$default (Lorg/mobilenativefoundation/store/store5/Bookkeeper;Ljava/lang/Object;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object; } +public final class org/mobilenativefoundation/store/store5/BuildConfig { + public static final field BUILD_TYPE Ljava/lang/String; + public static final field DEBUG Z + public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String; + public fun ()V +} + public abstract interface class org/mobilenativefoundation/store/store5/Clear { } diff --git a/tooling/plugins/build.gradle.kts b/tooling/plugins/build.gradle.kts index 21dcaa043..b111cda75 100644 --- a/tooling/plugins/build.gradle.kts +++ b/tooling/plugins/build.gradle.kts @@ -5,11 +5,11 @@ plugins { group = "org.mobilenativefoundation.store" java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(11)) } } diff --git a/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt b/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt index 95ea5960c..46ed3c227 100644 --- a/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt +++ b/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/AndroidConventionPlugin.kt @@ -24,11 +24,11 @@ class AndroidConventionPlugin : Plugin { extensions.configure { - compileSdk = 33 + compileSdk = 34 defaultConfig { minSdk = 24 - targetSdk = 33 + targetSdk = 34 } lint { @@ -39,8 +39,8 @@ class AndroidConventionPlugin : Plugin { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } diff --git a/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/KotlinMultiplatformConventionPlugin.kt b/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/KotlinMultiplatformConventionPlugin.kt index a80e70e1d..0c8f187c3 100644 --- a/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/KotlinMultiplatformConventionPlugin.kt +++ b/tooling/plugins/src/main/kotlin/org/mobilenativefoundation/store/tooling/plugins/KotlinMultiplatformConventionPlugin.kt @@ -61,7 +61,7 @@ class KotlinMultiplatformConventionPlugin : Plugin { nodejs() } - jvmToolchain(17) + jvmToolchain(11) targets.all { compilations.all { @@ -135,7 +135,7 @@ fun Project.configureKotlin() { fun Project.configureJava() { java { toolchain { - languageVersion.set(JavaLanguageVersion.of(17)) + languageVersion.set(JavaLanguageVersion.of(11)) } } } @@ -156,8 +156,8 @@ fun Project.configureAndroid() { } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 } } } @@ -170,9 +170,9 @@ private fun Project.java(action: JavaPluginExtension.() -> Unit) = extensions.co object Versions { const val COMPILE_SDK = 34 - const val MIN_SDK = 31 + const val MIN_SDK = 24 const val TARGET_SDK = 34 - const val STORE = "5.1.0-alpha03" + const val STORE = "5.1.0-alpha04" } @@ -218,7 +218,7 @@ fun Project.configureDokka() = tasks.withType().configureEach { dokkaSourceSets.configureEach { reportUndocumented.set(false) skipDeprecated.set(true) - jdkVersion.set(17) + jdkVersion.set(11) } } @@ -226,4 +226,4 @@ fun Project.android(name: String) { android { namespace = "org.mobilenativefoundation.store.$name" } -} \ No newline at end of file +}