Merge pull request #16 from reduxkotlin/feature/github-actions

patjackson52 · web-flow · commit 951cddfd8105 · 2020-07-06T21:25:32.000-04:00
Add GitHub actions for test &amp; publish
diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml
@@ -0,0 +1,24 @@
+name: Publish a release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  publish:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Publish Release
+      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 }}
+      run: ./gradlew publish
diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml
@@ -0,0 +1,50 @@
+name: Publish snapshot
+
+on:
+  push:
+    branches: [ master, feature/* ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  publish-snapshot:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest]
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - 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
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/README.md b/README.md
@@ -51,15 +51,15 @@ kotlin {
   sourceSets {
         commonMain { //   <---  name may vary on your project
             dependencies {
-                implementation "org.reduxkotlin:redux-kotlin-thunk:0.4.0"
+                implementation "org.reduxkotlin:redux-kotlin-thunk:0.5.3"
             }
         }
  }
 ```
 
 For JVM only:
 ```
-  implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.4.0"
+  implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.5.3"
 ```
 
 [badge-android]: http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat
diff --git a/build.gradle b/build.gradle
@@ -28,6 +28,9 @@ allprojects {
 
     group = GROUP
     version = VERSION_NAME
+    if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
+        version = version + "-SNAPSHOT"
+    }
 }
 
 task clean(type: Delete) {
diff --git a/gradle.properties b/gradle.properties
@@ -22,7 +22,7 @@ kotlin.code.style=official
 org.gradle.internal.publish.checksums.insecure=true
 
 GROUP=org.reduxkotlin
-VERSION_NAME=0.4.0
+VERSION_NAME=0.5.3
 
 POM_ARTIFACT_ID=reduxkotlin-thunk
 POM_DESCRIPTION=Redux thunmk implementation for Redux-Kotlin.  Mulitiplatform supported.
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -1,9 +1,9 @@
 ext.versions = [
-        kotlin          : '1.3.70',
+        kotlin          : '1.3.72',
         dokka           : '0.9.17',
         spek            : '2.1.0-alpha.0.9+3d5d865',
         atrium          : '0.8.0',
-        redux           : '0.4.0'
+        redux           : '0.5.3'
 ]
 
 ext.deps = [
diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -44,7 +44,7 @@ dokka {
 }
 
 def isReleaseBuild() {
-    return VERSION_NAME.contains("SNAPSHOT") == false
+    return version.contains("SNAPSHOT") == false
 }
 
 def getReleaseRepositoryUrl() {
@@ -58,11 +58,11 @@ def getSnapshotRepositoryUrl() {
 }
 
 def getRepositoryUsername() {
-    return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
+    return findProperty('SONATYPE_NEXUS_USERNAME') ?: System.getenv('SONATYPE_NEXUS_USERNAME') ?: ""
 }
 
 def getRepositoryPassword() {
-    return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
+    return findProperty('SONATYPE_NEXUS_PASSWORD') ?: System.getenv('SONATYPE_NEXUS_PASSWORD') ?: ""
 }
 
 task emptySourcesJar(type: Jar) {
@@ -75,7 +75,10 @@ task javadocsJar(type: Jar, dependsOn: dokka) {
 }
 
 signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+    required { isReleaseBuild() /*&& gradle.taskGraph.hasTask("uploadArchives") */ }
+    def signingKey = findProperty("GPG_SECRET") ?: System.getenv('GPG_SECRET') ?: ""
+    def signingPassword = findProperty("GPG_SIGNING_PASSWORD") ?: System.getenv('GPG_SIGNING_PASSWORD') ?: ""
+    useInMemoryPgpKeys(signingKey, signingPassword)
     sign(publishing.publications)
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/redux-kotlin-thunk/.gitignore b/redux-kotlin-thunk/.gitignore
diff --git a/redux-kotlin-thunk/build.gradle b/redux-kotlin-thunk/build.gradle
@@ -7,7 +7,7 @@ apply plugin: 'kotlin-multiplatform'
 archivesBaseName = 'redux-kotlin-thunk'
 
 group 'org.reduxkotlin'
-version '0.4.0'
+version '0.5.3'
 
 kotlin {
     jvm()
diff --git a/redux-kotlin-thunk/proguard-rules.pro b/redux-kotlin-thunk/proguard-rules.pro
diff --git a/redux-kotlin-thunk/src/commonMain/kotlin/org/reduxkotlin/Thunk.kt b/redux-kotlin-thunk/src/commonMain/kotlin/org/reduxkotlin/Thunk.kt
diff --git a/settings.gradle b/settings.gradle
@@ -8,10 +8,7 @@ pluginManagement {
     }
 }
 
-include ':lib'
+include ':redux-kotlin-thunk'
 rootProject.name='Redux-Kotlin-thunk'
 
-
-rootProject.name = 'test'
 enableFeaturePreview('GRADLE_METADATA')
-

Original file line number	Diff line number	Diff line change
`@@ -51,15 +51,15 @@ kotlin {`
`51`	`51`	`sourceSets {`
`52`	`52`	`commonMain { // <--- name may vary on your project`
`53`	`53`	`dependencies {`
`54`		`- implementation "org.reduxkotlin:redux-kotlin-thunk:0.4.0"`
	`54`	`+ implementation "org.reduxkotlin:redux-kotlin-thunk:0.5.3"`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	```
`59`	`59`
`60`	`60`	`For JVM only:`
`61`	`61`	```
`62`		`- implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.4.0"`
	`62`	`+ implementation "org.reduxkotlin:redux-kotlin-jvm-thunk:0.5.3"`
`63`	`63`	```
`64`	`64`
`65`	`65`	`[badge-android]: http://img.shields.io/badge/platform-android-brightgreen.svg?style=flat`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,9 @@ allprojects {`
`28`	`28`
`29`	`29`	`group = GROUP`
`30`	`30`	`version = VERSION_NAME`
	`31`	`+ if (hasProperty("SNAPSHOT") \|\| System.getenv("SNAPSHOT") != null) {`
	`32`	`+ version = version + "-SNAPSHOT"`
	`33`	`+ }`
`31`	`34`	`}`
`32`	`35`
`33`	`36`	`task clean(type: Delete) {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ dokka {`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`def isReleaseBuild() {`
`47`		`- return VERSION_NAME.contains("SNAPSHOT") == false`
	`47`	`+ return version.contains("SNAPSHOT") == false`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`def getReleaseRepositoryUrl() {`
`@@ -58,11 +58,11 @@ def getSnapshotRepositoryUrl() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`def getRepositoryUsername() {`
`61`		`- return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""`
	`61`	`+ return findProperty('SONATYPE_NEXUS_USERNAME') ?: System.getenv('SONATYPE_NEXUS_USERNAME') ?: ""`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`def getRepositoryPassword() {`
`65`		`- return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""`
	`65`	`+ return findProperty('SONATYPE_NEXUS_PASSWORD') ?: System.getenv('SONATYPE_NEXUS_PASSWORD') ?: ""`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`task emptySourcesJar(type: Jar) {`
`@@ -75,7 +75,10 @@ task javadocsJar(type: Jar, dependsOn: dokka) {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`signing {`
`78`		`- required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }`
	`78`	`+ required { isReleaseBuild() /&& gradle.taskGraph.hasTask("uploadArchives") / }`
	`79`	`+ def signingKey = findProperty("GPG_SECRET") ?: System.getenv('GPG_SECRET') ?: ""`
	`80`	`+ def signingPassword = findProperty("GPG_SIGNING_PASSWORD") ?: System.getenv('GPG_SIGNING_PASSWORD') ?: ""`
	`81`	`+ useInMemoryPgpKeys(signingKey, signingPassword)`
`79`	`82`	`sign(publishing.publications)`
`80`	`83`	`}`
`81`	`84`