Update to Gradle 6.1.1.

AnalyticalGraphicsInc · Feb 5, 2020 · 03b1e67 · 03b1e67
1 parent 9415f9b
commit 03b1e67
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 44 deletions.
diff --git a/Java/.idea/modules/CesiumLanguageWriter/cesiumlanguagewriter.iml b/Java/.idea/modules/CesiumLanguageWriter/cesiumlanguagewriter.iml
diff --git a/Java/CesiumLanguageWriter/build.gradle b/Java/CesiumLanguageWriter/build.gradle
@@ -1,7 +1,9 @@
-apply plugin: 'java-library'
+plugins {
+    id 'java-library'
+}
 
 dependencies {
-    implementation 'com.google.code.findbugs:jsr305:3.0.2'
+    compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 }
 
 sourceSets {
@@ -21,8 +23,9 @@ jar {
         attributes(
                 'Implementation-Title': 'CesiumLanguageWriter',
                 'Implementation-Vendor': 'Analytical Graphics, Inc.',
-                'Implementation-Version': version)
+                'Implementation-Version': archiveVersion)
     }
+    excludes = ['**/annotations/CS2J*']
 }
 
 test {
@@ -34,4 +37,5 @@ javadoc {
     options.encoding = "UTF-8"
     options.docEncoding = "UTF-8"
     options.charSet = "UTF-8"
+    excludes = ['**/annotations/CS2J*']
 }
diff --git a/Java/CesiumLanguageWriterTests/CesiumLanguageWriterTests.iml b/Java/CesiumLanguageWriterTests/CesiumLanguageWriterTests.iml
@@ -14,9 +14,9 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="cesiumlanguagewriter" scope="TEST" />
+    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: junit:junit:4.12" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-all:1.3" level="project" />
-    <orderEntry type="library" scope="TEST" name="Gradle: com.google.code.findbugs:jsr305:3.0.2" level="project" />
     <orderEntry type="library" scope="TEST" name="Gradle: org.hamcrest:hamcrest-core:1.3" level="project" />
   </component>
 </module>
diff --git a/Java/CesiumLanguageWriterTests/build.gradle b/Java/CesiumLanguageWriterTests/build.gradle
@@ -1,8 +1,8 @@
 dependencies {
-    testCompile project(':cesiumlanguagewriter')
-    testCompile 'junit:junit:4.12'
-    testCompile 'org.hamcrest:hamcrest-all:1.3'
-    testCompile 'com.google.code.findbugs:jsr305:3.0.2'
+    testImplementation project(':cesiumlanguagewriter')
+    testImplementation 'junit:junit:4.12'
+    testImplementation 'org.hamcrest:hamcrest-all:1.3'
+    testCompileOnly 'com.google.code.findbugs:jsr305:3.0.2'
 }
 
 sourceSets {

diff --git a/Java/gradle/wrapper/gradle-wrapper.jar b/Java/gradle/wrapper/gradle-wrapper.jar
diff --git a/Java/gradle/wrapper/gradle-wrapper.properties b/Java/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
diff --git a/Java/gradlew b/Java/gradlew
@@ -1,21 +1,5 @@
 #!/usr/bin/env sh
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -44,7 +28,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"

diff --git a/Java/gradlew.bat b/Java/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -30,7 +14,7 @@ set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome