Skip to content

Commit 95607a6

Browse files
patjackson52patjackson52
authored
Merge pull request #58 from reduxkotlin/feature/test-snapshot
fix CI publishing
2 parents 8cfdafd + 64d458b commit 95607a6

File tree

33 files changed

+91
-34
lines changed

33 files changed

+91
-34
lines changed

‎.github/workflows/publish_release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Publish a release
22

33
on:
44
push:

‎.github/workflows/publish_snapshot.yml

+41-24
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: CI
1+
name: Publish snapshot
22

33
on:
44
push:
@@ -7,41 +7,58 @@ on:
77
branches: [ master ]
88

99
jobs:
10-
test:
11-
runs-on: ubuntu-latest
12-
steps:
13-
- uses: actions/checkout@v2
14-
15-
- name: Test
16-
run: ./gradlew jvmTest
17-
18-
- name: Archive lib Test Reports
19-
uses: actions/upload-artifact@v1
20-
with:
21-
name: lib_test_reports
22-
path: lib/build/reports/tests
23-
24-
- name: Archive lib-threadsafe Test Reports
25-
uses: actions/upload-artifact@v1
26-
with:
27-
name: lib_test_reports
28-
path: lib/build/reports/tests
29-
3010
publish-snapshot:
31-
needs: test
3211
runs-on: ${{ matrix.os }}
3312
strategy:
3413
matrix:
35-
os: [ubuntu-latest, macos-latest, windows-latest]
14+
os: [macos-latest, windows-latest, ubuntu-latest]
3615

3716
steps:
3817
- uses: actions/checkout@v2
3918

40-
- name: Publish Snapshot
19+
- name: Publish macOS artifacts Snapshot
20+
id: publish-macos
21+
if: matrix.os == 'macos-latest'
22+
env:
23+
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
24+
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
25+
GPG_SECRET: ${{ secrets.GPG_SECRET }}
26+
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
27+
SNAPSHOT: 'TRUE'
28+
run: ./gradlew publish
29+
30+
- name: Publish windows artifacts Snapshot
31+
id: publish-win
32+
if: matrix.os == 'windows-latest'
33+
env:
34+
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
35+
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
36+
GPG_SECRET: ${{ secrets.GPG_SECRET }}
37+
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
38+
SNAPSHOT: 'TRUE'
39+
run: ./gradlew publish
40+
41+
- name: Publish linux artifacts Snapshot
42+
id: publish-linux
43+
if: matrix.os == 'ubuntu-latest'
4144
env:
4245
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
4346
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
4447
GPG_SECRET: ${{ secrets.GPG_SECRET }}
4548
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
4649
SNAPSHOT: 'TRUE'
4750
run: ./gradlew publish
51+
52+
- name: Archive lib publications dir
53+
uses: actions/upload-artifact@v1
54+
with:
55+
name: publications-${{ matrix.os }}
56+
path: redux-kotlin/build/publications
57+
58+
- name: Archive lib-threadsafe publications dir
59+
if: steps.publish-win.outputs.exit_code == 0 || steps.publish-macos.outputs.exit_code == 0 || steps.publish-linux.outputs.exit_code == 0
60+
uses: actions/upload-artifact@v1
61+
with:
62+
name: publications-threadsafe-${{ matrix.os }}
63+
path: redux-kotlin-threadsafe/build/publications
64+

‎.github/workflows/test.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Test
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'docs/**'
7+
- '*.md'
8+
9+
jobs:
10+
test:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v2
14+
15+
- name: Test
16+
run: ./gradlew jvmTest
17+
18+
- name: Archive redux-kotlin Test Reports
19+
uses: actions/upload-artifact@v1
20+
with:
21+
name: redux-kotlin_test_reports
22+
path: redux-kotlin/build/reports/tests
23+
24+
- name: Archive redux-kotlin-threadsafe Test Reports
25+
uses: actions/upload-artifact@v1
26+
with:
27+
name: redux-kotlin-threadsafe_test_reports
28+
path: redux-kotlin-threadsafe/build/reports/tests

‎examples/counter/android/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@ dependencies {
4040
implementation(Libs.appcompat)
4141

4242
implementation(project(":examples:counter:common"))
43-
implementation(project(":lib-threadsafe"))
43+
implementation(project(":redux-kotlin-threadsafe"))
4444
}

‎examples/counter/common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kotlin {
3232
commonMain {
3333
dependencies {
3434
implementation kotlin("stdlib-common")
35-
implementation project(":lib")
35+
implementation project(":redux-kotlin")
3636
}
3737
}
3838
commonTest {

‎examples/todos/android/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ dependencies {
4343
implementation(Libs.recyclerView)
4444

4545
implementation(project(":examples:todos:common"))
46-
implementation(project(":lib-threadsafe"))
46+
implementation(project(":redux-kotlin-threadsafe"))
4747
}

‎examples/todos/common/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ kotlin {
3232
commonMain {
3333
dependencies {
3434
implementation kotlin("stdlib-common")
35-
implementation project(":lib-threadsafe")
35+
implementation project(":redux-kotlin-threadsafe")
3636
}
3737
}
3838
commonTest {

‎gradle.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android.enableJetifier=true
2020
# Kotlin code style for this project: "official" or "obsolete":
2121
kotlin.code.style=official
2222

23-
GROUP=org.reduxkotlin.redux-kotlin
24-
VERSION_NAME=0.5.2
23+
GROUP=org.reduxkotlin
24+
VERSION_NAME=0.5.3
2525

2626
POM_ARTIFACT_ID=reduxkotlin
2727
POM_DESCRIPTION=Redux implementation for Kotlin. Mulitiplatform supported.

‎lib-threadsafe/build.gradle ‎redux-kotlin-threadsafe/build.gradle

+7-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ kotlin {
3535
commonMain {
3636
dependencies {
3737
implementation kotlin("stdlib-common")
38-
api project(":lib")
38+
api project(":redux-kotlin")
3939
}
4040
}
4141
commonTest {
@@ -118,6 +118,12 @@ afterEvaluate {
118118

119119
apply from: rootProject.file('gradle/publish.gradle')
120120

121+
publishing {
122+
publications.all {
123+
artifactId = artifactId.replace(project.name, 'redux-kotlin-threadsafe')
124+
}
125+
}
126+
121127
jvmTest {
122128
useJUnitPlatform {
123129
includeEngines 'spek2'

‎lib-threadsafe/src/commonMain/kotlin/org/reduxkotlin/CreateThreadSafeStore.kt ‎redux-kotlin-threadsafe/src/commonMain/kotlin/org/reduxkotlin/CreateThreadSafeStore.kt

File renamed without changes.

‎lib-threadsafe/src/commonMain/kotlin/org/reduxkotlin/SynchronizedStore.kt ‎redux-kotlin-threadsafe/src/commonMain/kotlin/org/reduxkotlin/SynchronizedStore.kt

File renamed without changes.

‎lib-threadsafe/src/jvmTest/kotlin/org/reduxkotlin/util/CreateThreadSafeStoreSpec.kt ‎redux-kotlin-threadsafe/src/jvmTest/kotlin/org/reduxkotlin/util/CreateThreadSafeStoreSpec.kt

File renamed without changes.

‎lib/.gitignore ‎redux-kotlin/.gitignore

File renamed without changes.

‎lib/build.gradle ‎redux-kotlin/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ afterEvaluate {
133133

134134
apply from: rootProject.file('gradle/publish.gradle')
135135

136+
publishing {
137+
publications.all {
138+
artifactId = artifactId.replace(project.name, 'redux-kotlin')
139+
}
140+
}
141+
136142
jvmTest {
137143
useJUnitPlatform {
138144
includeEngines 'spek2'

‎lib/proguard-rules.pro ‎redux-kotlin/proguard-rules.pro

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/Action.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/Action.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/ApplyMiddleware.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/ApplyMiddleware.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/CombineReducers.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/CombineReducers.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/Compose.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/Compose.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/CreateSameThreadEnforcedStore.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/CreateSameThreadEnforcedStore.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/CreateStore.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/CreateStore.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/Definitions.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/Definitions.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/utils/IsPlainObject.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/utils/IsPlainObject.kt

File renamed without changes.

‎lib/src/commonMain/kotlin/org/reduxkotlin/utils/ThreadUtil.kt ‎redux-kotlin/src/commonMain/kotlin/org/reduxkotlin/utils/ThreadUtil.kt

File renamed without changes.

‎lib/src/fallbackMain/kotlin/org/reduxkotlin/utils/ThreadUtilFallback.kt ‎redux-kotlin/src/fallbackMain/kotlin/org/reduxkotlin/utils/ThreadUtilFallback.kt

File renamed without changes.

‎lib/src/iosMain/kotlin/org/reduxkotlin/utils/ThreadUtiliOS.kt ‎redux-kotlin/src/iosMain/kotlin/org/reduxkotlin/utils/ThreadUtiliOS.kt

File renamed without changes.

‎lib/src/jsMain/kotlin/org/reduxkotlin/utils/ThreadUtil.kt ‎redux-kotlin/src/jsMain/kotlin/org/reduxkotlin/utils/ThreadUtil.kt

File renamed without changes.

‎lib/src/jvmMain/kotlin/org/reduxkotlin/utils/ThreadUtilJvm.kt ‎redux-kotlin/src/jvmMain/kotlin/org/reduxkotlin/utils/ThreadUtilJvm.kt

File renamed without changes.

‎lib/src/jvmTest/kotlin/org/reduxkotlin/util/CreateSameThreadEnforcedStoreSpec.kt ‎redux-kotlin/src/jvmTest/kotlin/org/reduxkotlin/util/CreateSameThreadEnforcedStoreSpec.kt

File renamed without changes.

‎lib/src/macosMain/kotlin/org/reduxkotlin/utils/ThreadUtilMacOs.kt ‎redux-kotlin/src/macosMain/kotlin/org/reduxkotlin/utils/ThreadUtilMacOs.kt

File renamed without changes.

‎lib/src/test/kotlin/org/reduxkotlin/ApplyMiddlewareTest.kt ‎redux-kotlin/src/test/kotlin/org/reduxkotlin/ApplyMiddlewareTest.kt

File renamed without changes.

‎lib/src/test/kotlin/org/reduxkotlin/CreateStoreSpec.kt ‎redux-kotlin/src/test/kotlin/org/reduxkotlin/CreateStoreSpec.kt

File renamed without changes.

‎settings.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ pluginManagement {
99
}
1010

1111
include(
12-
':lib',
13-
':lib-threadsafe',
12+
':redux-kotlin',
13+
':redux-kotlin-threadsafe',
1414
':examples:counter:common',
1515
':examples:counter:android',
1616
':examples:todos:common',

0 commit comments

Comments
 (0)