Skip to content

Commit c8f8652

Browse files
matt-ramotarmatt-ramotar
authored
Update Maven Publish Plugin (#711)
* Update Maven Publish Plugin Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> * Update Maven Publish Plugin Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> * Update Kotlin and Remove KMM Bridge Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> * Update Java Version Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> * Update CI Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> * Update CI Signed-off-by: Matt Ramotar <matt.ramotar@uber.com> --------- Signed-off-by: Matt Ramotar <matt.ramotar@uber.com>
1 parent 99571d3 commit c8f8652

File tree

14 files changed

+34
-111
lines changed

14 files changed

+34
-111
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,12 @@ jobs:
5959
- name: Checkout
6060
uses: actions/checkout@v3
6161

62-
- name: Set up JDK 11
62+
- name: Set up JDK 17
6363
uses: actions/setup-java@v4
6464
with:
6565
distribution: 'zulu'
66-
java-version: '11'
66+
java-version: '17'
67+
cache: 'gradle'
6768

6869
- name: Grant execute permission for Gradlew
6970
run: chmod +x gradlew

‎.github/workflows/create_swift_package.yml‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎RELEASING.md‎

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,22 @@ Releasing
22
========
33

44
1. Change the version in top level `gradle.properties` to a non-SNAPSHOT version.
5-
2. Update the `cocoapods` version in `build.gradle.kts` in `:store`.
6-
3. Modify `create_swift_package.yml` workflow.
7-
* https://github.com/MobileNativeFoundation/Store/blob/e526400cdf51aa2f78b6b7e9e87f4a6845e6dcea/.github/workflows/create_swift_package.yml
8-
4. Update the `CHANGELOG.md` for the impending release.
9-
5. Update the `README.md` with the new version.
10-
6. `git commit -sam "Prepare for release X.Y.Z."` (where X.Y.Z is the new version)
11-
7. `git tag -a X.Y.X -m "Version X.Y.Z"` (where X.Y.Z is the new version)
5+
2. Update the `CHANGELOG.md` for the impending release.
6+
3. Update the `README.md` with the new version.
7+
4. `git commit -sam "Prepare for release X.Y.Z."` (where X.Y.Z is the new version)
8+
5. `git tag -a X.Y.X -m "Version X.Y.Z"` (where X.Y.Z is the new version)
129
* Run `git tag` to verify it.
13-
8. `git push && git push --tags`
10+
6. `git push && git push --tags`
1411
* This should be pushed to your fork.
15-
9. Create a PR with this commit and merge it.
16-
10. Update the top level `build.gradle` to the next SNAPSHOT version.
17-
11. Modify `create_swift_package.yml` workflow to only run manually.
18-
* https://github.com/MobileNativeFoundation/Store/blob/de9ed1764408eeaafe5e58fe602205c875a8b0b0/.github/workflows/create_swift_package.yml
19-
12. `git commit -am "Prepare next development version."`
20-
13. Create a PR with this commit and merge it.
21-
14. Login to Sonatype to promote the artifacts https://central.sonatype.org/pages/releasing-the-deployment.html
12+
7. Create a PR with this commit and merge it.
13+
8. Update the top level `build.gradle` to the next SNAPSHOT version.
14+
9. `git commit -am "Prepare next development version."`
15+
10. Create a PR with this commit and merge it.
16+
11. Login to Sonatype to promote the artifacts https://central.sonatype.org/pages/releasing-the-deployment.html
2217
* This part is automated. If it fails in CI, follow the steps below.
2318
* Click on Staging Repositories under Build Promotion
2419
* Select all the Repositories that contain the content you want to release
2520
* Click on Close and refresh until the Release button is active
2621
* Click Release and submit
27-
15. Update the sample module's `build.gradle` to point to the newly released version. (It may take ~2 hours for artifact to be available after release)
22+
12. Update the sample module's `build.gradle` to point to the newly released version. (It may take ~2 hours for artifact to be available after release)
2823

‎build.gradle.kts‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ buildscript {
1919
classpath(libs.jacoco.gradle.plugin)
2020
classpath(libs.maven.publish.plugin)
2121
classpath(libs.atomic.fu.gradle.plugin)
22-
classpath(libs.kmmBridge.gradle.plugin)
2322
classpath(libs.binary.compatibility.validator)
2423
}
2524
}
@@ -49,13 +48,13 @@ subprojects {
4948
tasks {
5049
withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
5150
kotlinOptions {
52-
jvmTarget = "11"
51+
jvmTarget = "17"
5352
}
5453
}
5554

5655
withType<JavaCompile>().configureEach {
57-
sourceCompatibility = JavaVersion.VERSION_11.name
58-
targetCompatibility = JavaVersion.VERSION_11.name
56+
sourceCompatibility = JavaVersion.VERSION_17.name
57+
targetCompatibility = JavaVersion.VERSION_17.name
5958
}
6059
}
6160

‎cache/api/android/cache.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
public final class org/mobilenativefoundation/store/cache/BuildConfig {
2-
public static final field BUILD_TYPE Ljava/lang/String;
3-
public static final field DEBUG Z
4-
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
5-
public fun <init> ()V
6-
}
7-
81
public abstract interface class org/mobilenativefoundation/store/cache5/Cache {
92
public abstract fun getAllPresent ()Ljava/util/Map;
103
public abstract fun getAllPresent (Ljava/util/List;)Ljava/util/Map;

‎core/api/android/core.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
public final class org/mobilenativefoundation/store/core/BuildConfig {
2-
public static final field BUILD_TYPE Ljava/lang/String;
3-
public static final field DEBUG Z
4-
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
5-
public fun <init> ()V
6-
}
7-
81
public abstract interface annotation class org/mobilenativefoundation/store/core5/ExperimentalStoreApi : java/lang/annotation/Annotation {
92
}
103

‎gradle/libs.versions.toml‎

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,30 @@
11
[versions]
22
androidMinSdk = "24"
33
androidCompileSdk = "33"
4-
androidGradlePlugin = "7.4.2"
4+
androidGradlePlugin = "8.0.2"
55
androidTargetSdk = "33"
66
atomicFu = "0.24.0"
7-
baseKotlin = "2.0.20"
7+
baseKotlin = "2.1.21"
88
dokkaGradlePlugin = "1.9.20"
99
ktlintGradle = "12.1.0"
1010
jacocoGradlePlugin = "0.8.12"
11-
mavenPublishPlugin = "0.22.0"
11+
mavenPublishPlugin = "0.34.0"
1212
moleculeGradlePlugin = "1.2.1"
13-
pagingCompose = "3.3.0-alpha02"
14-
pagingRuntime = "3.2.1"
1513
spotlessPluginGradle = "6.4.1"
1614
junit = "4.13.2"
1715
kotlinxCoroutines = "1.8.1"
1816
kotlinxSerialization = "1.6.3"
1917
kermit = "2.0.5"
2018
testCore = "1.6.1"
21-
kmmBridge = "0.3.2"
2219
ktlint = "0.39.0"
2320
kover = "0.9.0-RC"
2421
store = "5.1.0-alpha07"
2522
truth = "1.1.3"
2623
turbine = "1.2.0"
27-
binary-compatibility-validator = "0.15.0-Beta.2"
24+
binary-compatibility-validator = "0.16.3"
2825

2926
[libraries]
3027
android-gradle-plugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
31-
androidx-paging-compose = { module = "androidx.paging:paging-compose", version.ref = "pagingCompose" }
32-
androidx-paging-runtime = { module = "androidx.paging:paging-runtime", version.ref = "pagingRuntime" }
3328
kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "baseKotlin" }
3429
kotlin-serialization-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "baseKotlin" }
3530
dokka-gradle-plugin = { group = "org.jetbrains.dokka", name = "dokka-gradle-plugin", version.ref = "dokkaGradlePlugin" }
@@ -39,7 +34,6 @@ maven-publish-plugin = { group = "com.vanniktech", name = "gradle-maven-publish-
3934
kover-gradle-plugin = {group = "org.jetbrains.kotlinx", name = "kover-gradle-plugin", version.ref = "kover"}
4035

4136
atomic-fu-gradle-plugin = { group = "org.jetbrains.kotlinx", name = "atomicfu-gradle-plugin", version.ref = "atomicFu" }
42-
kmmBridge-gradle-plugin = { group = "co.touchlab.faktory.kmmbridge", name = "co.touchlab.faktory.kmmbridge.gradle.plugin", version.ref = "kmmBridge" }
4337

4438
kotlinx-atomic-fu = { group = "org.jetbrains.kotlinx", name = "atomicfu", version.ref = "atomicFu" }
4539
kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib", version.ref = "baseKotlin" }

‎multicast/api/android/multicast.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
public final class org/mobilenativefoundation/store/multicast/BuildConfig {
2-
public static final field BUILD_TYPE Ljava/lang/String;
3-
public static final field DEBUG Z
4-
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
5-
public fun <init> ()V
6-
}
7-
81
public final class org/mobilenativefoundation/store/multicast5/Multicaster {
92
public fun <init> (Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/flow/Flow;ZZLkotlin/jvm/functions/Function2;)V
103
public synthetic fun <init> (Lkotlinx/coroutines/CoroutineScope;ILkotlinx/coroutines/flow/Flow;ZZLkotlin/jvm/functions/Function2;ILkotlin/jvm/internal/DefaultConstructorMarker;)V

‎rx2/api/rx2.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
public final class org/mobilenativefoundation/store/rx2/BuildConfig {
2-
public static final field BUILD_TYPE Ljava/lang/String;
3-
public static final field DEBUG Z
4-
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
5-
public fun <init> ()V
6-
}
7-
81
public final class org/mobilenativefoundation/store/rx2/RxFetcherKt {
92
public static final fun ofFlowable (Lorg/mobilenativefoundation/store/store5/Fetcher$Companion;Lkotlin/jvm/functions/Function1;)Lorg/mobilenativefoundation/store/store5/Fetcher;
103
public static final fun ofResultFlowable (Lorg/mobilenativefoundation/store/store5/Fetcher$Companion;Lkotlin/jvm/functions/Function1;)Lorg/mobilenativefoundation/store/store5/Fetcher;

‎store/api/android/store.api‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@ public final class org/mobilenativefoundation/store/store5/Bookkeeper$DefaultImp
1414
public static synthetic fun setLastFailedSync$default (Lorg/mobilenativefoundation/store/store5/Bookkeeper;Ljava/lang/Object;JLkotlin/coroutines/Continuation;ILjava/lang/Object;)Ljava/lang/Object;
1515
}
1616

17-
public final class org/mobilenativefoundation/store/store5/BuildConfig {
18-
public static final field BUILD_TYPE Ljava/lang/String;
19-
public static final field DEBUG Z
20-
public static final field LIBRARY_PACKAGE_NAME Ljava/lang/String;
21-
public fun <init> ()V
22-
}
23-
2417
public abstract interface class org/mobilenativefoundation/store/store5/Clear {
2518
}
2619

0 commit comments

Comments
 (0)