v1.6.0 (#25)

* updated to gradle 8.1.1 * updated to Java 17 * Changed dependency to be "jar" task
formkiq · Sep 9, 2023 · 126f447 · 126f447
1 parent a75db3c
commit 126f447
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 26 deletions.
diff --git a/.classpath b/.classpath
@@ -19,21 +19,14 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="src" output="bin/test" path="src/test/resources">
-		<attributes>
-			<attribute name="gradle_scope" value="test"/>
-			<attribute name="gradle_used_by_scope" value="test"/>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
 	<classpathentry kind="src" output="bin/functionalTest" path="src/functionalTest/java">
 		<attributes>
 			<attribute name="gradle_scope" value="functionalTest"/>
 			<attribute name="gradle_used_by_scope" value="functionalTest"/>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
 	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
 	<classpathentry kind="output" path="bin/default"/>
 </classpath>
diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs
@@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
 org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.compliance=17
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -138,7 +138,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
 org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
+org.eclipse.jdt.core.compiler.source=17
 org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
 org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 
 plugins {
     id 'java-gradle-plugin'
-    id "com.gradle.plugin-publish" version "0.12.0"
+    id "com.gradle.plugin-publish" version "1.2.1"
     id 'maven-publish'
     id 'signing'
     id 'eclipse'
@@ -10,16 +10,16 @@ plugins {
 }
 
 group   'com.formkiq.gradle'
-version '1.5.1'
+version '1.6.0'
 
 java {
   toolchain {
-    languageVersion.set(JavaLanguageVersion.of(11))
+    languageVersion.set(JavaLanguageVersion.of(17))
   }
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
 }
 
 dependencies {
@@ -54,12 +54,15 @@ spotless {
 
 gradlePlugin {
     // Define the plugin
+    website.set("https://github.com/formkiq/graalvm-native-plugin")
+    vcsUrl.set("https://github.com/formkiq/graalvm-native-plugin.git")
     plugins {
         nativeImage {
             id = 'com.formkiq.gradle.graalvm-native-plugin'
             displayName = 'GraalVM native Gradle plugin'
             description = 'Support for building Java applications as GraalVM native images'
             implementationClass = 'com.formkiq.gradle.GraalvmNativePlugin'
+            tags.set([ 'graal', 'graalvm', 'native', 'image', 'java', 'lambda', 'aws', ])
         }
     }
 }
@@ -95,12 +98,6 @@ publishing {
     }
 }
 
-pluginBundle {
-    website = 'https://github.com/formkiq/graalvm-native-plugin'
-    vcsUrl  = 'https://github.com/formkiq/graalvm-native-plugin.git'
-    tags    = [ 'graal', 'graalvm', 'native', 'image', 'java', 'lambda', 'aws', ]
-}
-
 check {
       dependsOn(tasks.publishToMavenLocal)
 }

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-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/java/com/formkiq/gradle/GraalvmNativeExtension.java b/src/main/java/com/formkiq/gradle/GraalvmNativeExtension.java
@@ -22,9 +22,9 @@
 public class GraalvmNativeExtension {
 
   /** Graalvm Default Version. */
-  private static final String DEFAULT_IMAGE_VERSION = "21.0.0";
+  private static final String DEFAULT_IMAGE_VERSION = "22.3.3";
   /** Java Default Version. */
-  private static final String DEFAULT_JAVA_VERSION = "java11";
+  private static final String DEFAULT_JAVA_VERSION = "java17";
 
   /** Additional Classpaths comma separated. */
   private Property<String> addClasspath;

diff --git a/src/main/java/com/formkiq/gradle/GraalvmNativePlugin.java b/src/main/java/com/formkiq/gradle/GraalvmNativePlugin.java
@@ -41,8 +41,7 @@ public void apply(final Project project) {
 
     project.afterEvaluate(task -> {
       Task graalvmNativeImage = project.getTasks().getByName("graalvmNativeImage");
-      graalvmNativeImage.dependsOn(project.getTasks().getByName("check"),
-          project.getTasks().getByName("assemble"));
+      graalvmNativeImage.dependsOn(project.getTasks().getByName("jar"));
     });
   }
 }