Skip to content

Commit 0d63d11

Browse files
piotrmadrypiotrmadry
authored
Merge pull request #19 from piotrmadry/update-dependencies
update dependencies [kotlin, gradle, kotlin-dsl]
2 parents 00fe501 + badf63d commit 0d63d11

File tree

6 files changed

+57
-48
lines changed

6 files changed

+57
-48
lines changed

‎build.gradle‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.71'
4+
ext.kotlin_version = '1.3.21'
55
repositories {
66
google()
77
jcenter()
88
mavenCentral()
99
maven { url "https://plugins.gradle.org/m2/" }
10-
maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
1110
}
1211
dependencies {
1312
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13+
classpath "org.gradle.kotlin:plugins:1.2.2"
1414
classpath "com.gradle.publish:plugin-publish-plugin:0.10.0"
1515
}
1616
}
@@ -21,7 +21,6 @@ allprojects {
2121
jcenter()
2222
mavenCentral()
2323
maven { url "https://plugins.gradle.org/m2/" }
24-
maven { url "https://dl.bintray.com/kotlin/kotlin-dev" }
2524
maven { url "https://repo.gradle.org/gradle/libs-releases-local/" }
2625
}
2726
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Mon Feb 11 20:37:25 CET 2019
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

‎plugin/build.gradle‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ apply plugin: "kotlin"
33
apply plugin: "java-gradle-plugin"
44
apply plugin: "maven"
55
apply plugin: "com.gradle.plugin-publish"
6+
apply plugin: "org.gradle.kotlin.kotlin-dsl"
67

78
group = "firebase.test.lab"
89
version = "1.1.6"
@@ -30,10 +31,23 @@ pluginBundle {
3031
}
3132
}
3233

34+
tasks {
35+
test {
36+
testLogging.showExceptions = true
37+
}
38+
}
39+
40+
configurations.all {
41+
resolutionStrategy.eachDependency { DependencyResolveDetails details ->
42+
def requested = details.requested
43+
if (requested.group == 'org.jetbrains.kotlin' && requested.name == 'kotlin-reflect') {
44+
details.useVersion kotlin_version
45+
}
46+
}
47+
}
48+
3349
dependencies {
34-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${kotlin_version}"
50+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
3551
implementation "com.android.tools.build:gradle:3.2.0"
3652
testCompile "junit:junit-dep:4.11"
37-
compileOnly "org.gradle:gradle-kotlin-dsl:1.0-rc-12"
38-
testImplementation "org.gradle:gradle-kotlin-dsl:1.0-rc-12"
3953
}

‎plugin/src/test/java/com/appunite/firebasetestlabplugin/IntegrationTest.kt‎

Lines changed: 33 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ class IntegrationTest {
1717
val simpleProject = File(javaClass.getResource("simple").file)
1818
val project = ProjectBuilder.builder().withProjectDir(simpleProject).build()
1919
project.plugins.apply("com.android.application")
20+
2021
project.configure<AppExtension> {
2122
compileSdkVersion(27)
22-
defaultConfig {
23-
it.versionCode = 1
24-
it.versionName = "0.1"
25-
it.setMinSdkVersion(27)
26-
it.setTargetSdkVersion(27)
23+
defaultConfig.apply {
24+
versionCode = 1
25+
versionName = "0.1"
26+
setMinSdkVersion(27)
27+
setTargetSdkVersion(27)
2728
}
2829
}
2930
(project as ProjectInternal).evaluate()
@@ -37,12 +38,6 @@ class IntegrationTest {
3738
project.plugins.apply("firebase.test.lab")
3839
project.configure<AppExtension> {
3940
compileSdkVersion(27)
40-
defaultConfig {
41-
it.versionCode = 1
42-
it.versionName = "0.1"
43-
it.setMinSdkVersion(27)
44-
it.setTargetSdkVersion(27)
45-
}
4641
}
4742
(project as ProjectInternal).evaluate()
4843

@@ -60,7 +55,7 @@ class IntegrationTest {
6055
project.plugins.apply("firebase.test.lab")
6156
project.configure<AppExtension> {
6257
compileSdkVersion(27)
63-
defaultConfig {
58+
defaultConfig.also {
6459
it.versionCode = 1
6560
it.versionName = "0.1"
6661
it.setMinSdkVersion(27)
@@ -85,7 +80,7 @@ class IntegrationTest {
8580
project.plugins.apply("firebase.test.lab")
8681
project.configure<AppExtension> {
8782
compileSdkVersion(27)
88-
defaultConfig {
83+
defaultConfig.also {
8984
it.versionCode = 1
9085
it.versionName = "0.1"
9186
it.setMinSdkVersion(27)
@@ -95,9 +90,9 @@ class IntegrationTest {
9590
project.configure<FirebaseTestLabPluginExtension> {
9691
googleProjectId = "test"
9792
keyFile = File(simpleProject, "key.json")
98-
createDevice("myDevice", {
93+
createDevice("myDevice") {
9994
deviceIds = listOf("Nexus6")
100-
})
95+
}
10196
}
10297
(project as ProjectInternal).evaluate()
10398

@@ -114,14 +109,14 @@ class IntegrationTest {
114109
project.plugins.apply("firebase.test.lab")
115110
project.configure<AppExtension> {
116111
compileSdkVersion(27)
117-
defaultConfig {
112+
defaultConfig.also {
118113
it.versionCode = 1
119114
it.versionName = "0.1"
120115
it.setMinSdkVersion(27)
121116
it.setTargetSdkVersion(27)
122117
}
123-
splits {
124-
it.abi {
118+
splits.also {
119+
it.abi.also {
125120
it.isEnable = true
126121
it.reset()
127122
it.include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -132,9 +127,9 @@ class IntegrationTest {
132127
project.configure<FirebaseTestLabPluginExtension> {
133128
googleProjectId = "test"
134129
keyFile = File(simpleProject, "key.json")
135-
createDevice("myDevice", {
130+
createDevice("myDevice") {
136131
deviceIds = listOf("Nexus6")
137-
})
132+
}
138133
}
139134
(project as ProjectInternal).evaluate()
140135

@@ -153,14 +148,14 @@ class IntegrationTest {
153148
project.plugins.apply("firebase.test.lab")
154149
project.configure<AppExtension> {
155150
compileSdkVersion(27)
156-
defaultConfig {
151+
defaultConfig.also {
157152
it.versionCode = 1
158153
it.versionName = "0.1"
159154
it.setMinSdkVersion(27)
160155
it.setTargetSdkVersion(27)
161156
}
162-
splits {
163-
it.abi {
157+
splits.also {
158+
it.abi.also {
164159
it.isEnable = true
165160
it.reset()
166161
it.include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -171,9 +166,9 @@ class IntegrationTest {
171166
project.configure<FirebaseTestLabPluginExtension> {
172167
googleProjectId = "test"
173168
keyFile = File(simpleProject, "key.json")
174-
createDevice("myDevice", {
169+
createDevice("myDevice") {
175170
deviceIds = listOf("Nexus6")
176-
})
171+
}
177172
}
178173
(project as ProjectInternal).evaluate()
179174

@@ -192,14 +187,14 @@ class IntegrationTest {
192187
project.plugins.apply("firebase.test.lab")
193188
project.configure<AppExtension> {
194189
compileSdkVersion(27)
195-
defaultConfig {
190+
defaultConfig.also {
196191
it.versionCode = 1
197192
it.versionName = "0.1"
198193
it.setMinSdkVersion(27)
199194
it.setTargetSdkVersion(27)
200195
}
201-
splits {
202-
it.abi {
196+
splits.also {
197+
it.abi.also {
203198
it.isEnable = true
204199
it.reset()
205200
it.include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -210,12 +205,12 @@ class IntegrationTest {
210205
project.configure<FirebaseTestLabPluginExtension> {
211206
googleProjectId = "test"
212207
keyFile = File(simpleProject, "key.json")
213-
createDevice("myDevice", {
208+
createDevice("myDevice") {
214209
deviceIds = listOf("Nexus6")
215210
filterAbiSplits = true
216211
abiSplits = setOf("armeabi-v7a")
217212
testUniversalApk = false
218-
})
213+
}
219214
}
220215
(project as ProjectInternal).evaluate()
221216

@@ -234,14 +229,14 @@ class IntegrationTest {
234229
project.plugins.apply("firebase.test.lab")
235230
project.configure<AppExtension> {
236231
compileSdkVersion(27)
237-
defaultConfig {
232+
defaultConfig.also {
238233
it.versionCode = 1
239234
it.versionName = "0.1"
240235
it.setMinSdkVersion(27)
241236
it.setTargetSdkVersion(27)
242237
}
243-
splits {
244-
it.abi {
238+
splits.also {
239+
it.abi.also {
245240
it.isEnable = true
246241
it.reset()
247242
it.include("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
@@ -252,10 +247,10 @@ class IntegrationTest {
252247
project.configure<FirebaseTestLabPluginExtension> {
253248
googleProjectId = "test"
254249
keyFile = File(simpleProject, "key.json")
255-
createDevice("myDevice", {
250+
createDevice("myDevice") {
256251
deviceIds = listOf("Nexus6")
257252
filterAbiSplits = true
258-
})
253+
}
259254
}
260255
(project as ProjectInternal).evaluate()
261256

@@ -274,7 +269,7 @@ class IntegrationTest {
274269
project.plugins.apply("firebase.test.lab")
275270
project.configure<AppExtension> {
276271
compileSdkVersion(27)
277-
defaultConfig {
272+
defaultConfig.also {
278273
it.versionCode = 1
279274
it.versionName = "0.1"
280275
it.setMinSdkVersion(27)
@@ -284,9 +279,9 @@ class IntegrationTest {
284279
project.configure<FirebaseTestLabPluginExtension> {
285280
googleProjectId = "test"
286281
keyFile = File(simpleProject, "key.json")
287-
createDevice("myDevice", {
282+
createDevice("myDevice") {
288283
deviceIds = listOf("Nexus6")
289-
})
284+
}
290285
}
291286
(project as ProjectInternal).evaluate()
292287

‎sample/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ firebaseTestLab {
8585
// Choose from `Firebase Test Lab tasks`, like: ./gradlew :app:firebaseTestLabExecuteDebugInstrumentationNexusEmulatorDebug
8686

8787
dependencies {
88-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
88+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
8989
implementation 'com.android.support:appcompat-v7:26.1.0'
9090
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
9191
testImplementation 'junit:junit:4.12'

‎sample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.1.60'
4+
ext.kotlin_version = '1.3.21'
55
repositories {
66
google()
77
jcenter()
@@ -11,7 +11,7 @@ buildscript {
1111
maven { url 'https://plugins.gradle.org/m2/' }
1212
}
1313
dependencies {
14-
classpath 'com.android.tools.build:gradle:3.1.0'
14+
classpath 'com.android.tools.build:gradle:3.4.0-beta03'
1515
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1616
classpath 'gradle.plugin.firebase.test.lab:plugin:1.1.2'
1717
}

0 commit comments

Comments
 (0)