Skip to content
This repository was archived by the owner on Jun 27, 2020. It is now read-only.

Commit 8a873b4

Browse files
committed
Update to gradle 4.10.3 and kotlin 1.3.10. Got rid of apply plugin syntax.
1 parent 8946c8c commit 8a873b4

File tree

12 files changed

+34
-23
lines changed

12 files changed

+34
-23
lines changed

build.gradle

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
buildscript {
22
repositories {
33
jcenter()
4-
}
5-
6-
dependencies {
7-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
4+
mavenCentral()
85
}
96
}
107

@@ -15,5 +12,6 @@ allprojects {
1512

1613
repositories {
1714
jcenter()
15+
mavenCentral()
1816
}
1917
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version=0.0.1-SNAPSHOT
22

3-
kotlin_version=1.1.61
3+
kotlin_version=1.3.10

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

kotlin-frontend/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
plugins {
2+
id "java"
3+
id "java-gradle-plugin"
4+
id "maven-publish"
5+
id "org.jetbrains.kotlin.jvm" version "1.3.10"
26
id "com.jfrog.bintray" version "1.7.3"
37
id 'net.researchgate.release' version '2.6.0'
48
}
59

6-
apply plugin: 'java'
7-
apply plugin: 'java-gradle-plugin'
8-
apply plugin: 'kotlin'
9-
apply plugin: 'maven-publish'
10-
1110
dependencies {
1211
compile gradleApi()
1312
compile localGroovy()

kotlin-frontend/src/main/kotlin/org/jetbrains/kotlin/gradle/frontend/util/NodeJsDownloadTask.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ open class NodeJsDownloadTask : DefaultTask() {
1515
var mirror: String = "https://nodejs.org/dist"
1616

1717
@get:Input
18-
var version: String = "7.9.0"
18+
var version: String = "10.14.1"
1919

2020
@get:OutputFile
2121
var nodePathTextFile: File = project.buildDir.resolve("nodePath.txt")

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/AbstractFrontendTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.jetbrains.kotlin.gradle.frontend
22

33
import org.gradle.testkit.runner.*
44
import org.gradle.testkit.runner.internal.*
5-
import org.jetbrains.kotlin.preprocessor.*
5+
import org.jetbrains.kotlin.gradle.frontend.util.mkdirsOrFail
66
import org.junit.*
77
import org.junit.rules.*
88
import org.junit.runner.*

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/MergeMapsTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlin.gradle.frontend
22

33
import org.jetbrains.kotlin.gradle.frontend.util.*
4-
import org.junit.*
4+
import org.junit.Test
55
import kotlin.test.*
66

77
class MergeMapsTest {

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/OutputStreamBufferTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.jetbrains.kotlin.gradle.frontend
22

33
import org.jetbrains.kotlin.gradle.frontend.util.*
4-
import org.junit.*
4+
import org.junit.Test
55
import java.io.*
66
import kotlin.test.*
77

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/SimpleFrontendProjectTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import groovy.json.JsonSlurper
44
import org.gradle.testkit.runner.BuildTask
55
import org.gradle.testkit.runner.GradleRunner
66
import org.gradle.testkit.runner.TaskOutcome
7+
import org.jetbrains.kotlin.gradle.frontend.util.mkdirsOrFail
78
import org.jetbrains.kotlin.gradle.frontend.util.toSemver
8-
import org.jetbrains.kotlin.preprocessor.mkdirsOrFail
99
import org.junit.Test
1010
import org.junit.runner.RunWith
1111
import org.junit.runners.Parameterized

kotlin-frontend/src/test/kotlin/org/jetbrains/kotlin/gradle/frontend/TestCustomNodePath.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package org.jetbrains.kotlin.gradle.frontend
33
import org.apache.tools.ant.taskdefs.condition.*
44
import org.jetbrains.kotlin.gradle.frontend.util.*
55
import org.junit.*
6+
import org.junit.Test
67
import org.junit.rules.*
78
import kotlin.test.*
89

0 commit comments

Comments
 (0)