Skip to content

Commit 37de8eb

Browse files
author
Patrick Jackson
committed
[WIP] migrate to build.gradle.kts files. update to kotlin 1.4.0-rc
1 parent 10b66df commit 37de8eb

File tree

18 files changed

+427
-198
lines changed

18 files changed

+427
-198
lines changed

build.gradle

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

build.gradle.kts

Lines changed: 38 additions & 0 deletions
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+
}

buildSrc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.gradle/
2+
build/

buildSrc/build.gradle.kts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
repositories {
2+
jcenter()
3+
}
4+
5+
plugins {
6+
`kotlin-dsl`
7+
}

buildSrc/src/main/kotlin/Libs.kt

Lines changed: 184 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,184 @@
1+
import kotlin.String
2+
3+
/**
4+
* Generated by https://github.com/jmfayard/buildSrcVersions
5+
*
6+
* Update this file with
7+
* `$ ./gradlew buildSrcVersions`
8+
*/
9+
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+
31+
/**
32+
* https://developer.android.com/studio
33+
*/
34+
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
55+
56+
const val dokka_gradle_plugin: String = "org.jetbrains.dokka:dokka-gradle-plugin:" +
57+
Versions.dokka_gradle_plugin
58+
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+
72+
/**
73+
* https://kotlinlang.org/
74+
*/
75+
const val kotlin_annotation_processing_gradle: String =
76+
"org.jetbrains.kotlin:kotlin-annotation-processing-gradle:" + Versions.org_jetbrains_kotlin
77+
78+
const val kotlin_compiler_embeddable: String =
79+
"org.jetbrains.kotlin:kotlin-compiler-embeddable:" + Versions.org_jetbrains_kotlin
80+
81+
/**
82+
* https://kotlinlang.org/
83+
*/
84+
const val kotlin_gradle_plugin: String = "org.jetbrains.kotlin:kotlin-gradle-plugin:" +
85+
Versions.org_jetbrains_kotlin
86+
87+
const val kotlin_klib_commonizer_embeddable: String =
88+
"org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:" + Versions.org_jetbrains_kotlin
89+
90+
/**
91+
* https://kotlinlang.org/
92+
*/
93+
const val kotlin_reflect: String = "org.jetbrains.kotlin:kotlin-reflect:" +
94+
Versions.org_jetbrains_kotlin
95+
96+
/**
97+
* https://kotlinlang.org/
98+
*/
99+
const val kotlin_scripting_compiler_embeddable: String =
100+
"org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:" + Versions.org_jetbrains_kotlin
101+
102+
/**
103+
* 1.3.72
104+
*/
105+
const val kotlin_stdlib_common: String = "org.jetbrains.kotlin:kotlin-stdlib-common:" +
106+
Versions.org_jetbrains_kotlin
107+
108+
/**
109+
* https://kotlinlang.org/
110+
*/
111+
const val kotlin_stdlib_jdk8: String = "org.jetbrains.kotlin:kotlin-stdlib-jdk8:" +
112+
Versions.org_jetbrains_kotlin
113+
114+
/**
115+
* 1.3.72
116+
*/
117+
const val kotlin_stdlib_js: String = "org.jetbrains.kotlin:kotlin-stdlib-js:" +
118+
Versions.org_jetbrains_kotlin
119+
120+
/**
121+
* 1.3.72
122+
*/
123+
const val kotlin_stdlib: String = "org.jetbrains.kotlin:kotlin-stdlib:" +
124+
Versions.org_jetbrains_kotlin
125+
126+
/**
127+
* https://kotlinlang.org/
128+
*/
129+
const val kotlin_test_annotations_common: String =
130+
"org.jetbrains.kotlin:kotlin-test-annotations-common:" + Versions.org_jetbrains_kotlin
131+
132+
/**
133+
* https://kotlinlang.org/
134+
*/
135+
const val kotlin_test_common: String = "org.jetbrains.kotlin:kotlin-test-common:" +
136+
Versions.org_jetbrains_kotlin
137+
138+
/**
139+
* https://kotlinlang.org/
140+
*/
141+
const val kotlin_test_js: String = "org.jetbrains.kotlin:kotlin-test-js:" +
142+
Versions.org_jetbrains_kotlin
143+
144+
/**
145+
* https://kotlinlang.org/
146+
*/
147+
const val kotlin_test_junit: String = "org.jetbrains.kotlin:kotlin-test-junit:" +
148+
Versions.org_jetbrains_kotlin
149+
150+
/**
151+
* https://kotlinlang.org/
152+
*/
153+
const val kotlin_test: String = "org.jetbrains.kotlin:kotlin-test:" +
154+
Versions.org_jetbrains_kotlin
155+
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
172+
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
184+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
object Plugins {
2+
const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:${Versions.org_jetbrains_kotlin}"
3+
const val dokka = "org.jetbrains.dokka:dokka-gradle-plugin:${Versions.dokka_gradle_plugin}"
4+
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}"
6+
}
Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
import org.gradle.plugin.use.PluginDependenciesSpec
2+
import org.gradle.plugin.use.PluginDependencySpec
3+
import kotlin.String
4+
5+
/**
6+
* Generated by https://github.com/jmfayard/buildSrcVersions
7+
*
8+
* Find which updates are available by running
9+
* `$ ./gradlew buildSrcVersions`
10+
* This will only update the comments.
11+
*
12+
* YOU are responsible for updating manually the dependency version.
13+
*/
14+
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"
26+
27+
const val de_fayard_buildsrcversions_gradle_plugin: String = "0.4.2" // available: "0.7.0"
28+
29+
const val io_mockk: String = "1.9.3" // available: "1.10.0"
30+
31+
const val dokka_gradle_plugin: String = "0.9.17" // available: "0.11.0-dev-59"
32+
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"
42+
43+
const val kotlinx_coroutines_test: String = "1.3.8-1.4.0-rc"
44+
45+
/**
46+
*
47+
* See issue 19: How to update Gradle itself?
48+
* https://github.com/jmfayard/buildSrcVersions/issues/19
49+
*/
50+
const val gradleLatestVersion: String = "6.5.1"
51+
52+
const val gradleCurrentVersion: String = "6.5"
53+
}
54+
55+
/**
56+
* See issue #47: how to update buildSrcVersions itself
57+
* https://github.com/jmfayard/buildSrcVersions/issues/47
58+
*/
59+
val PluginDependenciesSpec.buildSrcVersions: PluginDependencySpec
60+
inline get() =
61+
id("de.fayard.buildSrcVersions").version(Versions.de_fayard_buildsrcversions_gradle_plugin)

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.4.0
24+
VERSION_NAME=0.5.0
2525

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

gradle/dependencies.gradle

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

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.2.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

0 commit comments

Comments
 (0)