Upgrade to Gradle 5.0

- Fixed missing Gradle version specifications in two tests. - Added missing settings.gradle in the test projects because Gradle 5.0 starts to complain about it.
jdneo · Dec 28, 2018 · cd8e7bb · cd8e7bb
1 parent 1a64a64
commit cd8e7bb
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 2 deletions.
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
diff --git a/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy b/src/test/groovy/com/google/protobuf/gradle/ProtobufJavaPluginTest.groovy
@@ -90,6 +90,7 @@ class ProtobufJavaPluginTest extends Specification {
       .withProjectDir(projectDir)
       .withArguments('build')
       .withDebug(true)
+      .withGradleVersion(gradleVersion)
       .build()
 
     then: "it succeed"
@@ -111,6 +112,7 @@ class ProtobufJavaPluginTest extends Specification {
       .withProjectDir(projectDir)
       .withArguments('build')
       .withDebug(true)
+      .withGradleVersion(gradleVersion)
       .build()
 
     then: "it succeed"
@@ -212,7 +214,7 @@ class ProtobufJavaPluginTest extends Specification {
 
     then: "it succeed"
     result.task(":idea").outcome == TaskOutcome.SUCCESS
-    Node imlRoot = new XmlParser().parse(projectDir.toPath().resolve("testIdea.iml").toFile())
+    Node imlRoot = new XmlParser().parse(projectDir.toPath().resolve("testProject.iml").toFile())
     Collection rootMgr = imlRoot.component.findAll { it.'@name' == 'NewModuleRootManager' }
     assert rootMgr.size() == 1
     assert rootMgr.content.sourceFolder.size() == 1

diff --git a/testProject/settings.gradle b/testProject/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProject'
diff --git a/testProjectCustomProtoDir/settings.gradle b/testProjectCustomProtoDir/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectCustomProtoDir'
diff --git a/testProjectDependent/settings.gradle b/testProjectDependent/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectDependent'
diff --git a/testProjectJavaAndKotlin/settings.gradle b/testProjectJavaAndKotlin/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectJavaAndKotlin'
diff --git a/testProjectKotlin/settings.gradle b/testProjectKotlin/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectKotlin'
diff --git a/testProjectLite/settings.gradle b/testProjectLite/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'testProjectLite'