Skip to content

Commit 0c87b30

Browse files
authored
Merge pull request #67 from reduxkotlin/kotlin-1.4
Kotlin 1.4
2 parents 241ac2f + e9d424f commit 0c87b30

File tree

43 files changed

+1046
-1171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1046
-1171
lines changed

.github/workflows/publish_snapshot.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Publish snapshot
22

33
on:
44
push:
5-
branches: [ master, feature/* ]
5+
branches: [ master, feature/*, kotlin-* ]
66
pull_request:
77
branches: [ master ]
88

.github/workflows/test.yml renamed to .github/workflows/pull_request.yml

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Test
1+
name: PR
22

33
on:
44
pull_request:
@@ -7,13 +7,25 @@ on:
77
- '*.md'
88

99
jobs:
10-
test:
10+
ktlint:
1111
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]
1224
steps:
1325
- uses: actions/checkout@v2
1426

1527
- name: Test
16-
run: ./gradlew jvmTest
28+
run: ./gradlew allTest
1729

1830
- name: Archive redux-kotlin Test Reports
1931
uses: actions/upload-artifact@v1

build.gradle

-41
This file was deleted.

build.gradle.kts

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
2+
buildscript {
3+
repositories {
4+
google()
5+
mavenCentral()
6+
maven("https://dl.bintray.com/jetbrains/kotlin-native-dependencies")
7+
maven("https://plugins.gradle.org/m2/")
8+
maven("https://oss.sonatype.org/content/repositories/snapshots")
9+
jcenter()
10+
}
11+
12+
dependencies {
13+
classpath(Plugins.kotlin)
14+
classpath(Plugins.dokka)
15+
classpath(Plugins.android)
16+
classpath(Plugins.atomicFu)
17+
}
18+
}
19+
20+
plugins {
21+
id("de.fayard.buildSrcVersions") version "0.4.2"
22+
}
23+
24+
allprojects {
25+
repositories {
26+
google()
27+
jcenter()
28+
maven("https://kotlin.bintray.com/kotlinx")
29+
maven("https://oss.sonatype.org/content/repositories/snapshots")
30+
mavenCentral()
31+
}
32+
33+
group = project.properties["GROUP"]!!
34+
version = project.properties["VERSION_NAME"]!!
35+
if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
36+
version = "$version-SNAPSHOT"
37+
}
38+
}

0 commit comments

Comments
 (0)