Upgrade to Gradle 6.0.1 (#108)

billoneil · web-flow · commit 797ccef94938 · 2019-11-19T08:14:29.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -22,6 +22,9 @@ allprojects {
     // Using Jitpack so I need the repo name in the group to match.
     group = 'com.stubbornjava.StubbornJava'
     version = '0.0.0-SNAPSHOT'
+    
+    sourceCompatibility = 1.8
+    targetCompatibility = 1.8
 
     sourceSets {
         main {
diff --git a/gradle.properties b/gradle.properties
@@ -1,2 +1,3 @@
 org.gradle.configureondemand=true
 org.gradle.parallel=true
+org.gradle.caching=true
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
@@ -21,11 +21,12 @@ ext {
         hashids           : '1.0.3',       // Id hashing
         failsafe          : '1.1.0',       // retry and circuit breakers
         jsoup             : '1.11.3',      // DOM parsing library
-        lombok            : '1.18.2',      // Code gen
+        lombok            : '1.18.10',     // Code gen
         sitemapgen4j      : '1.0.6',       // Sitemap generator for SEO
         jbcrypt           : '0.4',         // BCrypt salted hashing library
         romeRss           : '1.0',         // RSS Library
         kotlin            : '1.3.60',      // Kotlin
+        javax             : '1.3.2',
 
         junit             : '4.12',        // Unit Testing
     ]
@@ -73,6 +74,7 @@ ext {
         jbcrypt                   : "org.mindrot:jbcrypt:$versions.jbcrypt",
         romeRss                   : "rome:rome:$versions.romeRss",
         kotlin                    : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin",
+        javaxAnnotation           : "javax.annotation:javax.annotation-api:$versions.javax",
 
         junit                     : "junit:junit:$versions.junit",
     ]
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.0.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/stubbornjava-cms-server/build.gradle b/stubbornjava-cms-server/build.gradle
@@ -3,7 +3,8 @@ dependencies {
     compile project(':stubbornjava-undertow')
     compile project(':stubbornjava-common')
     
-    compile libs.lombok
-    
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
+        
     testCompile libs.junit
 }
diff --git a/stubbornjava-common/build.gradle b/stubbornjava-common/build.gradle
@@ -39,7 +39,11 @@ dependencies {
     compile libs.jooqCodegen
     compile libs.flyway
     compile libs.connectorj
+    compile libs.javaxAnnotation
     
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
+        
     testCompile libs.junit
     testCompile libs.hsqldb
 }
diff --git a/stubbornjava-webapp/build.gradle b/stubbornjava-webapp/build.gradle
@@ -7,16 +7,18 @@ dependencies {
     compile project(':stubbornjava-common')
     compile project(':stubbornjava-cms-server')
 
-    compile libs.lombok
     compile libs.romeRss
+    
+    compileOnly libs.lombok
+    annotationProcessor libs.lombok
 
     testCompile libs.junit
 }
 
 shadowJar {
-   baseName = 'stubbornjava-all'
+   archiveBaseName = 'stubbornjava-all'
    classifier = null
-   version = null
+   archiveVersion = null
 }
 
 // {{end:dependencies}}

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`org.gradle.configureondemand=true`
`2`	`2`	`org.gradle.parallel=true`
	`3`	`+org.gradle.caching=true`