Skip to content

Commit 126f447

Browse files
authored
v1.6.0 (#25)
* updated to gradle 8.1.1 * updated to Java 17 * Changed dependency to be "jar" task
1 parent a75db3c commit 126f447

6 files changed

Lines changed: 15 additions & 26 deletions

File tree

.classpath

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,14 @@
1919
<attribute name="test" value="true"/>
2020
</attributes>
2121
</classpathentry>
22-
<classpathentry kind="src" output="bin/test" path="src/test/resources">
23-
<attributes>
24-
<attribute name="gradle_scope" value="test"/>
25-
<attribute name="gradle_used_by_scope" value="test"/>
26-
<attribute name="test" value="true"/>
27-
</attributes>
28-
</classpathentry>
2922
<classpathentry kind="src" output="bin/functionalTest" path="src/functionalTest/java">
3023
<attributes>
3124
<attribute name="gradle_scope" value="functionalTest"/>
3225
<attribute name="gradle_used_by_scope" value="functionalTest"/>
3326
<attribute name="test" value="true"/>
3427
</attributes>
3528
</classpathentry>
36-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
29+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17/"/>
3730
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
3831
<classpathentry kind="output" path="bin/default"/>
3932
</classpath>

.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
2020
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
2121
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
2222
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
23-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
23+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
2424
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
25-
org.eclipse.jdt.core.compiler.compliance=11
25+
org.eclipse.jdt.core.compiler.compliance=17
2626
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
2727
org.eclipse.jdt.core.compiler.debug.localVariable=generate
2828
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -138,7 +138,7 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
138138
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
139139
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
140140
org.eclipse.jdt.core.compiler.release=disabled
141-
org.eclipse.jdt.core.compiler.source=11
141+
org.eclipse.jdt.core.compiler.source=17
142142
org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns=false
143143
org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
144144
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

build.gradle

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
plugins {
33
id 'java-gradle-plugin'
4-
id "com.gradle.plugin-publish" version "0.12.0"
4+
id "com.gradle.plugin-publish" version "1.2.1"
55
id 'maven-publish'
66
id 'signing'
77
id 'eclipse'
@@ -10,16 +10,16 @@ plugins {
1010
}
1111

1212
group 'com.formkiq.gradle'
13-
version '1.5.1'
13+
version '1.6.0'
1414

1515
java {
1616
toolchain {
17-
languageVersion.set(JavaLanguageVersion.of(11))
17+
languageVersion.set(JavaLanguageVersion.of(17))
1818
}
1919
}
2020

2121
repositories {
22-
jcenter()
22+
mavenCentral()
2323
}
2424

2525
dependencies {
@@ -54,12 +54,15 @@ spotless {
5454

5555
gradlePlugin {
5656
// Define the plugin
57+
website.set("https://github.com/formkiq/graalvm-native-plugin")
58+
vcsUrl.set("https://github.com/formkiq/graalvm-native-plugin.git")
5759
plugins {
5860
nativeImage {
5961
id = 'com.formkiq.gradle.graalvm-native-plugin'
6062
displayName = 'GraalVM native Gradle plugin'
6163
description = 'Support for building Java applications as GraalVM native images'
6264
implementationClass = 'com.formkiq.gradle.GraalvmNativePlugin'
65+
tags.set([ 'graal', 'graalvm', 'native', 'image', 'java', 'lambda', 'aws', ])
6366
}
6467
}
6568
}
@@ -95,12 +98,6 @@ publishing {
9598
}
9699
}
97100

98-
pluginBundle {
99-
website = 'https://github.com/formkiq/graalvm-native-plugin'
100-
vcsUrl = 'https://github.com/formkiq/graalvm-native-plugin.git'
101-
tags = [ 'graal', 'graalvm', 'native', 'image', 'java', 'lambda', 'aws', ]
102-
}
103-
104101
check {
105102
dependsOn(tasks.publishToMavenLocal)
106103
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

src/main/java/com/formkiq/gradle/GraalvmNativeExtension.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
public class GraalvmNativeExtension {
2323

2424
/** Graalvm Default Version. */
25-
private static final String DEFAULT_IMAGE_VERSION = "21.0.0";
25+
private static final String DEFAULT_IMAGE_VERSION = "22.3.3";
2626
/** Java Default Version. */
27-
private static final String DEFAULT_JAVA_VERSION = "java11";
27+
private static final String DEFAULT_JAVA_VERSION = "java17";
2828

2929
/** Additional Classpaths comma separated. */
3030
private Property<String> addClasspath;

src/main/java/com/formkiq/gradle/GraalvmNativePlugin.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ public void apply(final Project project) {
4141

4242
project.afterEvaluate(task -> {
4343
Task graalvmNativeImage = project.getTasks().getByName("graalvmNativeImage");
44-
graalvmNativeImage.dependsOn(project.getTasks().getByName("check"),
45-
project.getTasks().getByName("assemble"));
44+
graalvmNativeImage.dependsOn(project.getTasks().getByName("jar"));
4645
});
4746
}
4847
}

0 commit comments

Comments
 (0)