Merge pull request #58 from reduxkotlin/feature/test-snapshot

fix CI publishing
reduxkotlin · Jul 6, 2020 · 95607a6 · 95607a6
2 parents 8cfdafd + 64d458b
commit 95607a6
Show file tree

Hide file tree

Showing 33 changed files with 91 additions and 34 deletions.
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Publish a release
 
 on:
   push:

diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -1,4 +1,4 @@
-name: CI
+name: Publish snapshot
 
 on:
   push:
@@ -7,41 +7,58 @@ on:
     branches: [ master ]
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Test
-        run: ./gradlew jvmTest
-
-      - name: Archive lib Test Reports
-        uses: actions/upload-artifact@v1
-        with:
-          name: lib_test_reports
-          path: lib/build/reports/tests
-
-      - name: Archive lib-threadsafe Test Reports
-        uses: actions/upload-artifact@v1
-        with:
-          name: lib_test_reports
-          path: lib/build/reports/tests
-
   publish-snapshot:
-    needs: test
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest, macos-latest, windows-latest]
+        os: [macos-latest, windows-latest, ubuntu-latest]
 
     steps:
     - uses: actions/checkout@v2
 
-    - name: Publish Snapshot
+    - name: Publish macOS artifacts Snapshot
+      id: publish-macos
+      if: matrix.os == 'macos-latest'
+      env:
+        SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+        SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+        GPG_SECRET: ${{ secrets.GPG_SECRET }}
+        GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
+        SNAPSHOT: 'TRUE'
+      run: ./gradlew publish
+
+    - name: Publish windows artifacts Snapshot
+      id: publish-win
+      if: matrix.os == 'windows-latest'
+      env:
+        SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+        SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+        GPG_SECRET: ${{ secrets.GPG_SECRET }}
+        GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
+        SNAPSHOT: 'TRUE'
+      run: ./gradlew publish
+
+    - name: Publish linux artifacts Snapshot
+      id: publish-linux
+      if: matrix.os == 'ubuntu-latest'
       env:
         SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
         SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
         GPG_SECRET: ${{ secrets.GPG_SECRET }}
         GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
         SNAPSHOT: 'TRUE'
       run: ./gradlew publish
+
+    - name: Archive lib publications dir
+      uses: actions/upload-artifact@v1
+      with:
+        name: publications-${{ matrix.os }}
+        path: redux-kotlin/build/publications
+
+    - name: Archive lib-threadsafe publications dir
+      if: steps.publish-win.outputs.exit_code == 0 || steps.publish-macos.outputs.exit_code == 0 || steps.publish-linux.outputs.exit_code == 0
+      uses: actions/upload-artifact@v1
+      with:
+        name: publications-threadsafe-${{ matrix.os }}
+        path: redux-kotlin-threadsafe/build/publications
+
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,28 @@
+name: Test
+
+on:
+  pull_request:
+    paths-ignore:
+      - 'docs/**'
+      - '*.md'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Test
+        run: ./gradlew jvmTest
+
+      - name: Archive redux-kotlin Test Reports
+        uses: actions/upload-artifact@v1
+        with:
+          name: redux-kotlin_test_reports
+          path: redux-kotlin/build/reports/tests
+
+      - name: Archive redux-kotlin-threadsafe Test Reports
+        uses: actions/upload-artifact@v1
+        with:
+          name: redux-kotlin-threadsafe_test_reports
+          path: redux-kotlin-threadsafe/build/reports/tests
diff --git a/examples/counter/android/build.gradle.kts b/examples/counter/android/build.gradle.kts
@@ -40,5 +40,5 @@ dependencies {
     implementation(Libs.appcompat)
 
     implementation(project(":examples:counter:common"))
-    implementation(project(":lib-threadsafe"))
+    implementation(project(":redux-kotlin-threadsafe"))
 }
diff --git a/examples/counter/common/build.gradle b/examples/counter/common/build.gradle
@@ -32,7 +32,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin("stdlib-common")
-                implementation project(":lib")
+                implementation project(":redux-kotlin")
             }
         }
         commonTest {

diff --git a/examples/todos/android/build.gradle.kts b/examples/todos/android/build.gradle.kts
@@ -43,5 +43,5 @@ dependencies {
     implementation(Libs.recyclerView)
 
     implementation(project(":examples:todos:common"))
-    implementation(project(":lib-threadsafe"))
+    implementation(project(":redux-kotlin-threadsafe"))
 }
diff --git a/examples/todos/common/build.gradle b/examples/todos/common/build.gradle
@@ -32,7 +32,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin("stdlib-common")
-                implementation project(":lib-threadsafe")
+                implementation project(":redux-kotlin-threadsafe")
             }
         }
         commonTest {

diff --git a/gradle.properties b/gradle.properties
@@ -20,8 +20,8 @@ android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
 
-GROUP=org.reduxkotlin.redux-kotlin
-VERSION_NAME=0.5.2
+GROUP=org.reduxkotlin
+VERSION_NAME=0.5.3
 
 POM_ARTIFACT_ID=reduxkotlin
 POM_DESCRIPTION=Redux implementation for Kotlin.  Mulitiplatform supported.

diff --git a/lib-threadsafe/build.gradle → redux-kotlin-threadsafe/build.gradle b/lib-threadsafe/build.gradle → redux-kotlin-threadsafe/build.gradle
@@ -35,7 +35,7 @@ kotlin {
         commonMain {
             dependencies {
                 implementation kotlin("stdlib-common")
-                api project(":lib")
+                api project(":redux-kotlin")
             }
         }
         commonTest {
@@ -118,6 +118,12 @@ afterEvaluate {
 
 apply from: rootProject.file('gradle/publish.gradle')
 
+publishing {
+    publications.all {
+        artifactId = artifactId.replace(project.name, 'redux-kotlin-threadsafe')
+    }
+}
+
 jvmTest {
     useJUnitPlatform {
         includeEngines 'spek2'

diff --git a/.../org/reduxkotlin/CreateThreadSafeStore.kt → .../org/reduxkotlin/CreateThreadSafeStore.kt b/.../org/reduxkotlin/CreateThreadSafeStore.kt → .../org/reduxkotlin/CreateThreadSafeStore.kt
diff --git a/...tlin/org/reduxkotlin/SynchronizedStore.kt → ...tlin/org/reduxkotlin/SynchronizedStore.kt b/...tlin/org/reduxkotlin/SynchronizedStore.kt → ...tlin/org/reduxkotlin/SynchronizedStore.kt
diff --git a/...xkotlin/util/CreateThreadSafeStoreSpec.kt → ...xkotlin/util/CreateThreadSafeStoreSpec.kt b/...xkotlin/util/CreateThreadSafeStoreSpec.kt → ...xkotlin/util/CreateThreadSafeStoreSpec.kt
diff --git a/lib/.gitignore → redux-kotlin/.gitignore b/lib/.gitignore → redux-kotlin/.gitignore
diff --git a/lib/build.gradle → redux-kotlin/build.gradle b/lib/build.gradle → redux-kotlin/build.gradle
@@ -133,6 +133,12 @@ afterEvaluate {
 
 apply from: rootProject.file('gradle/publish.gradle')
 
+publishing {
+    publications.all {
+        artifactId = artifactId.replace(project.name, 'redux-kotlin')
+    }
+}
+
 jvmTest {
     useJUnitPlatform {
         includeEngines 'spek2'

diff --git a/lib/proguard-rules.pro → redux-kotlin/proguard-rules.pro b/lib/proguard-rules.pro → redux-kotlin/proguard-rules.pro
diff --git a/...mmonMain/kotlin/org/reduxkotlin/Action.kt → ...mmonMain/kotlin/org/reduxkotlin/Action.kt b/...mmonMain/kotlin/org/reduxkotlin/Action.kt → ...mmonMain/kotlin/org/reduxkotlin/Action.kt
diff --git a/...kotlin/org/reduxkotlin/ApplyMiddleware.kt → ...kotlin/org/reduxkotlin/ApplyMiddleware.kt b/...kotlin/org/reduxkotlin/ApplyMiddleware.kt → ...kotlin/org/reduxkotlin/ApplyMiddleware.kt
diff --git a/...kotlin/org/reduxkotlin/CombineReducers.kt → ...kotlin/org/reduxkotlin/CombineReducers.kt b/...kotlin/org/reduxkotlin/CombineReducers.kt → ...kotlin/org/reduxkotlin/CombineReducers.kt
diff --git a/...monMain/kotlin/org/reduxkotlin/Compose.kt → ...monMain/kotlin/org/reduxkotlin/Compose.kt b/...monMain/kotlin/org/reduxkotlin/Compose.kt → ...monMain/kotlin/org/reduxkotlin/Compose.kt
diff --git a/...uxkotlin/CreateSameThreadEnforcedStore.kt → ...uxkotlin/CreateSameThreadEnforcedStore.kt b/...uxkotlin/CreateSameThreadEnforcedStore.kt → ...uxkotlin/CreateSameThreadEnforcedStore.kt
diff --git a/...ain/kotlin/org/reduxkotlin/CreateStore.kt → ...ain/kotlin/org/reduxkotlin/CreateStore.kt b/...ain/kotlin/org/reduxkotlin/CreateStore.kt → ...ain/kotlin/org/reduxkotlin/CreateStore.kt
diff --git a/...ain/kotlin/org/reduxkotlin/Definitions.kt → ...ain/kotlin/org/reduxkotlin/Definitions.kt b/...ain/kotlin/org/reduxkotlin/Definitions.kt → ...ain/kotlin/org/reduxkotlin/Definitions.kt
diff --git a/...in/org/reduxkotlin/utils/IsPlainObject.kt → ...in/org/reduxkotlin/utils/IsPlainObject.kt b/...in/org/reduxkotlin/utils/IsPlainObject.kt → ...in/org/reduxkotlin/utils/IsPlainObject.kt
diff --git a/...otlin/org/reduxkotlin/utils/ThreadUtil.kt → ...otlin/org/reduxkotlin/utils/ThreadUtil.kt b/...otlin/org/reduxkotlin/utils/ThreadUtil.kt → ...otlin/org/reduxkotlin/utils/ThreadUtil.kt
diff --git a/...g/reduxkotlin/utils/ThreadUtilFallback.kt → ...g/reduxkotlin/utils/ThreadUtilFallback.kt b/...g/reduxkotlin/utils/ThreadUtilFallback.kt → ...g/reduxkotlin/utils/ThreadUtilFallback.kt
diff --git a/...in/org/reduxkotlin/utils/ThreadUtiliOS.kt → ...in/org/reduxkotlin/utils/ThreadUtiliOS.kt b/...in/org/reduxkotlin/utils/ThreadUtiliOS.kt → ...in/org/reduxkotlin/utils/ThreadUtiliOS.kt
diff --git a/...otlin/org/reduxkotlin/utils/ThreadUtil.kt → ...otlin/org/reduxkotlin/utils/ThreadUtil.kt b/...otlin/org/reduxkotlin/utils/ThreadUtil.kt → ...otlin/org/reduxkotlin/utils/ThreadUtil.kt
diff --git a/...in/org/reduxkotlin/utils/ThreadUtilJvm.kt → ...in/org/reduxkotlin/utils/ThreadUtilJvm.kt b/...in/org/reduxkotlin/utils/ThreadUtilJvm.kt → ...in/org/reduxkotlin/utils/ThreadUtilJvm.kt
diff --git a/...util/CreateSameThreadEnforcedStoreSpec.kt → ...util/CreateSameThreadEnforcedStoreSpec.kt b/...util/CreateSameThreadEnforcedStoreSpec.kt → ...util/CreateSameThreadEnforcedStoreSpec.kt
diff --git a/.../org/reduxkotlin/utils/ThreadUtilMacOs.kt → .../org/reduxkotlin/utils/ThreadUtilMacOs.kt b/.../org/reduxkotlin/utils/ThreadUtilMacOs.kt → .../org/reduxkotlin/utils/ThreadUtilMacOs.kt
diff --git a/...in/org/reduxkotlin/ApplyMiddlewareTest.kt → ...in/org/reduxkotlin/ApplyMiddlewareTest.kt b/...in/org/reduxkotlin/ApplyMiddlewareTest.kt → ...in/org/reduxkotlin/ApplyMiddlewareTest.kt
diff --git a/...kotlin/org/reduxkotlin/CreateStoreSpec.kt → ...kotlin/org/reduxkotlin/CreateStoreSpec.kt b/...kotlin/org/reduxkotlin/CreateStoreSpec.kt → ...kotlin/org/reduxkotlin/CreateStoreSpec.kt
diff --git a/settings.gradle b/settings.gradle
@@ -9,8 +9,8 @@ pluginManagement {
 }
 
 include(
-    ':lib',
-    ':lib-threadsafe',
+    ':redux-kotlin',
+    ':redux-kotlin-threadsafe',
     ':examples:counter:common',
     ':examples:counter:android',
     ':examples:todos:common',