Skip to content

Commit 503a2ae

Browse files
authored
Merge pull request #64 from reduxkotlin/task/63-ktlint
#63 ktlint
2 parents 1c970c5 + b50ef72 commit 503a2ae

File tree

27 files changed

+418
-380
lines changed

27 files changed

+418
-380
lines changed

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

Lines changed: 10 additions & 1 deletion
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,7 +7,16 @@ on:
77
- '*.md'
88

99
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"
1018
test:
19+
needs: ktlint
1120
runs-on: ${{ matrix.os }}
1221
strategy:
1322
matrix:

build.gradle.kts

Lines changed: 29 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
1+
12
buildscript {
2-
repositories {
3-
google()
4-
mavenCentral()
5-
maven("https://dl.bintray.com/jetbrains/kotlin-native-dependencies")
6-
maven("https://plugins.gradle.org/m2/")
7-
maven("https://oss.sonatype.org/content/repositories/snapshots")
8-
jcenter()
9-
}
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+
}
1011

11-
dependencies {
12-
classpath(Plugins.kotlin)
13-
classpath(Plugins.dokka)
14-
classpath(Plugins.android)
15-
classpath(Plugins.atomicFu)
16-
}
12+
dependencies {
13+
classpath(Plugins.kotlin)
14+
classpath(Plugins.dokka)
15+
classpath(Plugins.android)
16+
classpath(Plugins.atomicFu)
17+
}
1718
}
1819

1920
plugins {
20-
id("de.fayard.buildSrcVersions") version "0.4.2"
21+
id("de.fayard.buildSrcVersions") version "0.4.2"
2122
}
2223

2324
allprojects {
24-
repositories {
25-
google()
26-
jcenter()
27-
maven("https://kotlin.bintray.com/kotlinx")
28-
maven("https://oss.sonatype.org/content/repositories/snapshots")
29-
mavenCentral()
30-
}
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+
}
3132

32-
group = project.properties["GROUP"]!!
33-
version = project.properties["VERSION_NAME"]!!
34-
if (hasProperty("SNAPSHOT") || System.getenv("SNAPSHOT") != null) {
35-
version = "$version-SNAPSHOT"
36-
}
37-
}
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)