Browse Source

Upgrade to Gradle 5.1.1, fix new deprecations

tags/v0.2.0
Chris Smith 5 years ago
parent
commit
562bbc84fe
3 changed files with 11 additions and 6 deletions
  1. 1
    0
      CHANGELOG
  2. 9
    5
      build.gradle.kts
  3. 1
    1
      gradle/wrapper/gradle-wrapper.properties

+ 1
- 0
CHANGELOG View File

1
 v0.2.0 [in development]
1
 v0.2.0 [in development]
2
 
2
 
3
   * Added support for connecting over TLS
3
   * Added support for connecting over TLS
4
+  * (Internal) Upgraded to Gradle 5.1.1

+ 9
- 5
build.gradle.kts View File

46
 
46
 
47
 task<Test>("itest") {
47
 task<Test>("itest") {
48
     group = "verification"
48
     group = "verification"
49
-    testClassesDirs = java.sourceSets.getByName("itest").output.classesDirs
50
-    classpath = java.sourceSets.getByName("itest").runtimeClasspath
49
+    testClassesDirs = sourceSets["itest"].output.classesDirs
50
+    classpath = sourceSets["itest"].runtimeClasspath
51
 }
51
 }
52
 
52
 
53
 task<Jar>("sourceJar") {
53
 task<Jar>("sourceJar") {
54
     description = "Creates a JAR that contains the source code."
54
     description = "Creates a JAR that contains the source code."
55
-    from(java.sourceSets["main"].allSource)
56
-    classifier = "sources"
55
+    from(sourceSets["main"].allSource)
56
+    archiveClassifier.set("sources")
57
+}
58
+
59
+tasks.withType<Wrapper> {
60
+    gradleVersion = "5.1.1"
57
 }
61
 }
58
 
62
 
59
 tasks.withType<KotlinCompile> {
63
 tasks.withType<KotlinCompile> {
91
                 root.appendNode("description", "Kotlin library for connecting to and interacting with IRC")
95
                 root.appendNode("description", "Kotlin library for connecting to and interacting with IRC")
92
 
96
 
93
                 val dependenciesNode = root.appendNode("dependencies")
97
                 val dependenciesNode = root.appendNode("dependencies")
94
-                configurations.implementation.allDependencies.forEach {
98
+                configurations.implementation.get().allDependencies.forEach {
95
                     val dependencyNode = dependenciesNode.appendNode("dependency")
99
                     val dependencyNode = dependenciesNode.appendNode("dependency")
96
                     dependencyNode.appendNode("groupId", it.group)
100
                     dependencyNode.appendNode("groupId", it.group)
97
                     dependencyNode.appendNode("artifactId", it.name)
101
                     dependencyNode.appendNode("artifactId", it.name)

+ 1
- 1
gradle/wrapper/gradle-wrapper.properties View File

1
 distributionBase=GRADLE_USER_HOME
1
 distributionBase=GRADLE_USER_HOME
2
 distributionPath=wrapper/dists
2
 distributionPath=wrapper/dists
3
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
3
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
4
 zipStoreBase=GRADLE_USER_HOME
4
 zipStoreBase=GRADLE_USER_HOME
5
 zipStorePath=wrapper/dists
5
 zipStorePath=wrapper/dists

Loading…
Cancel
Save