Skip to content

Commit 73eca55

Browse files
author
Patrick Jackson
committed
update kotlin 1.4.0, buildSrcVersions, add platforms to match redux-kotlin (all platforms)
1 parent 37de8eb commit 73eca55

File tree

14 files changed

+136
-161
lines changed

14 files changed

+136
-161
lines changed

‎.circleci/config.yml‎

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

‎.github/workflows/publish_release.yml‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Publish a release
2+
3+
on:
4+
push:
5+
tags:
6+
- 'v*'
7+
8+
jobs:
9+
publish:
10+
runs-on: ${{ matrix.os }}
11+
strategy:
12+
matrix:
13+
os: [ubuntu-latest, macos-latest, windows-latest]
14+
15+
steps:
16+
- uses: actions/checkout@v2
17+
18+
- name: Publish Release
19+
env:
20+
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
21+
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
22+
GPG_SECRET: ${{ secrets.GPG_SECRET }}
23+
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
24+
run: ./gradlew publish

‎.github/workflows/publish_snapshot.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Publish snapshot
2+
3+
on:
4+
push:
5+
branches: [ master, feature/*, kotlin-* ]
6+
pull_request:
7+
branches: [ master ]
8+
9+
jobs:
10+
publish-snapshot:
11+
runs-on: ${{ matrix.os }}
12+
strategy:
13+
matrix:
14+
os: [macos-latest, windows-latest, ubuntu-latest]
15+
16+
steps:
17+
- uses: actions/checkout@v2
18+
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'
44+
env:
45+
SONATYPE_NEXUS_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
46+
SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
47+
GPG_SECRET: ${{ secrets.GPG_SECRET }}
48+
GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}
49+
SNAPSHOT: 'TRUE'
50+
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/pull_request.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: PR
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'docs/**'
7+
- '*.md'
8+
9+
jobs:
10+
ktlint:
11+
runs-on: ubuntu-latest
12+
13+
steps:
14+
- uses: actions/checkout@v2
15+
16+
- name: Ktlint
17+
uses: "vroy/gha-kotlin-linter@v1"
18+
test:
19+
needs: ktlint
20+
runs-on: ${{ matrix.os }}
21+
strategy:
22+
matrix:
23+
os: [macos-latest, windows-latest, ubuntu-latest]
24+
steps:
25+
- uses: actions/checkout@v2
26+
27+
- name: Test
28+
run: ./gradlew build
29+

‎build.gradle.kts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ buildscript {
1313
classpath(Plugins.kotlin)
1414
classpath(Plugins.dokka)
1515
classpath(Plugins.android)
16-
classpath(Plugins.atomicFu)
1716
}
1817
}
1918

‎buildSrc/src/main/kotlin/Libs.kt‎

Lines changed: 3 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -7,68 +7,15 @@ import kotlin.String
77
* `$ ./gradlew buildSrcVersions`
88
*/
99
object Libs {
10-
/**
11-
* https://developer.android.com/jetpack/androidx
12-
*/
13-
const val appcompat: String = "androidx.appcompat:appcompat:" + Versions.appcompat
14-
15-
/**
16-
* http://tools.android.com
17-
*/
18-
const val constraintlayout: String = "androidx.constraintlayout:constraintlayout:" +
19-
Versions.constraintlayout
20-
21-
/**
22-
* https://developer.android.com/jetpack/androidx
23-
*/
24-
const val recyclerview: String = "androidx.recyclerview:recyclerview:" + Versions.recyclerview
25-
26-
/**
27-
* https://developer.android.com/studio
28-
*/
29-
const val aapt2: String = "com.android.tools.build:aapt2:" + Versions.aapt2
30-
3110
/**
3211
* https://developer.android.com/studio
3312
*/
3413
const val com_android_tools_build_gradle: String = "com.android.tools.build:gradle:" +
35-
Versions.com_android_tools_build_gradle
36-
37-
/**
38-
* https://developer.android.com/studio
39-
*/
40-
const val lint_gradle: String = "com.android.tools.lint:lint-gradle:" + Versions.lint_gradle
41-
42-
const val de_fayard_buildsrcversions_gradle_plugin: String =
43-
"de.fayard.buildSrcVersions:de.fayard.buildSrcVersions.gradle.plugin:" +
44-
Versions.de_fayard_buildsrcversions_gradle_plugin
45-
46-
/**
47-
* http://mockk.io
48-
*/
49-
const val mockk_common: String = "io.mockk:mockk-common:" + Versions.io_mockk
50-
51-
/**
52-
* http://mockk.io
53-
*/
54-
const val mockk: String = "io.mockk:mockk:" + Versions.io_mockk
14+
Versions.com_android_tools_build_gradle
5515

5616
const val dokka_gradle_plugin: String = "org.jetbrains.dokka:dokka-gradle-plugin:" +
5717
Versions.dokka_gradle_plugin
5818

59-
/**
60-
* https://kotlinlang.org/
61-
*/
62-
const val kotlin_android_extensions_runtime: String =
63-
"org.jetbrains.kotlin:kotlin-android-extensions-runtime:" + Versions.org_jetbrains_kotlin
64-
65-
/**
66-
* https://kotlinlang.org/
67-
*/
68-
const val kotlin_android_extensions: String =
69-
"org.jetbrains.kotlin:kotlin-android-extensions:" +
70-
Versions.org_jetbrains_kotlin
71-
7219
/**
7320
* https://kotlinlang.org/
7421
*/
@@ -153,32 +100,7 @@ object Libs {
153100
const val kotlin_test: String = "org.jetbrains.kotlin:kotlin-test:" +
154101
Versions.org_jetbrains_kotlin
155102

156-
/**
157-
* https://github.com/Kotlin/atomicfu
158-
*/
159-
const val atomicfu_gradle_plugin: String = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:" +
160-
Versions.atomicfu_gradle_plugin
161-
162-
/**
163-
* https://github.com/Kotlin/atomicfu
164-
*/
165-
const val atomicfu: String = "org.jetbrains.kotlinx:atomicfu:" + Versions.atomicfu
166-
167-
/**
168-
* https://github.com/Kotlin/kotlinx.coroutines
169-
*/
170-
const val kotlinx_coroutines_core_jvm: String =
171-
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:" + Versions.kotlinx_coroutines_core_jvm
103+
const val redux_kotlin: String = "org.reduxkotlin:redux-kotlin:" +
104+
Versions.org_reduxkotlin_redux_kotlin
172105

173-
/**
174-
* https://github.com/Kotlin/kotlinx.coroutines
175-
*/
176-
const val kotlinx_coroutines_core: String = "org.jetbrains.kotlinx:kotlinx-coroutines-core:" +
177-
Versions.kotlinx_coroutines_core
178-
179-
/**
180-
* https://github.com/Kotlin/kotlinx.coroutines
181-
*/
182-
const val kotlinx_coroutines_test: String = "org.jetbrains.kotlinx:kotlinx-coroutines-test:" +
183-
Versions.kotlinx_coroutines_test
184106
}

‎buildSrc/src/main/kotlin/Plugins.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ object Plugins {
22
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
33
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
44
const val android = "com.android.tools.build:gradle:${Versions.com_android_tools_build_gradle}"
5-
const val atomicFu = "org.jetbrains.kotlinx:atomicfu-gradle-plugin:${Versions.atomicfu}"
65
}

‎buildSrc/src/main/kotlin/Versions.kt‎

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,44 +12,28 @@ import kotlin.String
1212
* YOU are responsible for updating manually the dependency version.
1313
*/
1414
object Versions {
15-
const val appcompat: String = "1.1.0-rc01" // available: "1.1.0"
16-
17-
const val constraintlayout: String = "1.1.3"
18-
19-
const val recyclerview: String = "1.0.0" // available: "1.1.0"
20-
21-
const val aapt2: String = "3.6.0-6040484" // available: "4.0.1-6197926"
22-
23-
const val com_android_tools_build_gradle: String = "3.6.0" // available: "4.0.1"
24-
25-
const val lint_gradle: String = "26.6.0" // available: "27.0.1"
15+
/**
16+
* https://developer.android.com/studio
17+
*/
2618

27-
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" // available: "0.7.0"
19+
const val com_android_tools_build_gradle: String = "4.0.1"
2820

29-
const val io_mockk: String = "1.9.3" // available: "1.10.0"
21+
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.7.0"
3022

3123
const val dokka_gradle_plugin: String = "0.9.17" // available: "0.11.0-dev-59"
3224

33-
const val org_jetbrains_kotlin: String = "1.4.0-rc"
34-
35-
const val atomicfu_gradle_plugin: String = "0.14.3-1.4.0-rc"
36-
37-
const val atomicfu: String = "0.14.3-1.4.0-rc"
38-
39-
const val kotlinx_coroutines_core_jvm: String = "1.3.8-1.4.0-rc"
40-
41-
const val kotlinx_coroutines_core: String = "1.3.8-1.4.0-rc"
25+
const val org_jetbrains_kotlin: String = "1.4.0"
4226

43-
const val kotlinx_coroutines_test: String = "1.3.8-1.4.0-rc"
27+
const val org_reduxkotlin_redux_kotlin: String = "0.5.5"
4428

4529
/**
4630
*
4731
* See issue 19: How to update Gradle itself?
4832
* https://github.com/jmfayard/buildSrcVersions/issues/19
4933
*/
50-
const val gradleLatestVersion: String = "6.5.1"
34+
const val gradleLatestVersion: String = "6.6"
5135

52-
const val gradleCurrentVersion: String = "6.5"
36+
const val gradleCurrentVersion: String = "6.6"
5337
}
5438

5539
/**

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android.enableJetifier=true
2121
kotlin.code.style=official
2222

2323
GROUP=org.reduxkotlin
24-
VERSION_NAME=0.5.0
24+
VERSION_NAME=0.5.5
2525

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

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip

0 commit comments

Comments
 (0)