Skip to content

Commit 9f70846

Browse files
olyagplolyagpl
committed
Fix gardle example build
1 parent 558cca0 commit 9f70846

File tree

15 files changed

+106
-48
lines changed

15 files changed

+106
-48
lines changed

‎.github/workflows/microservices-micronaut-hello-rest-gradle.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,4 @@ jobs:
2626
- name: Run 'microservices/micronaut-hello-rest-gradle'
2727
run: |
2828
cd native-image/microservices/micronaut-hello-rest-gradle
29-
gradle assemble
30-
gradle nativeCompile
31-
./build/native/nativeCompile/MnHelloRest &
32-
sleep 5
33-
curl "http://localhost:8080/hello"
29+
./run.sh

‎.github/workflows/microservices-micronaut-hello-rest-maven.yml‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,4 @@ jobs:
2929
- name: Run 'microservices/micronaut-hello-rest-maven'
3030
run: |
3131
cd native-image/microservices/micronaut-hello-rest-maven
32-
mvn --no-transfer-progress clean package
33-
mvn --no-transfer-progress package -Dpackaging=native-image
34-
./target/MnHelloRest &
35-
sleep 5
36-
curl "http://localhost:8080/hello"
32+
./run.sh

‎native-image/microservices/micronaut-hello-rest-gradle/build.gradle‎

Lines changed: 38 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
plugins {
2-
id("com.github.johnrengelman.shadow") version "7.1.2"
3-
id("io.micronaut.application") version "3.7.0"
2+
id("com.github.johnrengelman.shadow") version "8.1.1"
3+
id("io.micronaut.application") version "4.4.4"
4+
id("com.diffplug.spotless") version "6.23.3"
5+
id("io.micronaut.aot") version "4.4.4"
46
}
57

68
version = "0.1"
@@ -12,29 +14,54 @@ repositories {
1214

1315
dependencies {
1416
annotationProcessor("io.micronaut:micronaut-http-validation")
15-
implementation("io.micronaut:micronaut-http-client")
16-
implementation("io.micronaut:micronaut-jackson-databind")
17-
implementation("jakarta.annotation:jakarta.annotation-api")
17+
annotationProcessor("io.micronaut.serde:micronaut-serde-processor")
18+
implementation("io.micronaut.serde:micronaut-serde-jackson")
19+
compileOnly("io.micronaut:micronaut-http-client")
1820
runtimeOnly("ch.qos.logback:logback-classic")
19-
implementation("io.micronaut:micronaut-validation")
20-
21+
testImplementation("io.micronaut:micronaut-http-client")
2122
}
2223

2324

2425
application {
25-
mainClass.set("hello.Application")
26+
mainClass = "com.example.Application"
2627
}
2728
java {
28-
sourceCompatibility = JavaVersion.toVersion("17")
29-
targetCompatibility = JavaVersion.toVersion("17")
29+
sourceCompatibility = JavaVersion.toVersion("21")
30+
targetCompatibility = JavaVersion.toVersion("21")
3031
}
3132

33+
3234
graalvmNative.toolchainDetection = false
35+
3336
micronaut {
3437
runtime("netty")
3538
testRuntime("junit5")
3639
processing {
3740
incremental(true)
38-
annotations("hello.*")
41+
annotations("example.micronaut.*")
3942
}
43+
aot {
44+
// Please review carefully the optimizations enabled below
45+
// Check https://micronaut-projects.github.io/micronaut-aot/latest/guide/ for more details
46+
optimizeServiceLoading = false
47+
convertYamlToJava = false
48+
precomputeOperations = true
49+
cacheEnvironment = true
50+
optimizeClassLoading = true
51+
deduceEnvironment = true
52+
optimizeNetty = true
53+
replaceLogbackXml = true
54+
}
55+
}
56+
57+
graalvmNative {
58+
binaries {
59+
main {
60+
imageName.set('MnHelloRest')
61+
}
62+
}
63+
}
64+
65+
tasks.named("dockerfileNative") {
66+
jdkVersion = "21"
4067
}

‎native-image/microservices/micronaut-hello-rest-gradle/ghome/daemon/8.11.1/registry.bin‎

73 Bytes
Binary file not shown.

‎native-image/microservices/micronaut-hello-rest-gradle/ghome/daemon/8.11.1/registry.bin.lock‎

17 Bytes
Binary file not shown.

‎native-image/microservices/micronaut-hello-rest-gradle/gradle.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
micronautVersion=3.8.2
1+
micronautVersion=4.7.2
2+
org.gradle.jvmargs=-Xmx4G

‎native-image/microservices/micronaut-hello-rest-gradle/gradle/wrapper/gradle-wrapper.jar‎

42.6 KB
Binary file not shown.

‎native-image/microservices/micronaut-hello-rest-gradle/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
6+
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

‎native-image/microservices/micronaut-hello-rest-gradle/gradlew‎

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,12 @@ do
8082
esac
8183
done
8284

83-
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
84-
85-
APP_NAME="Gradle"
85+
# This is normally unused
86+
# shellcheck disable=SC2034
8687
APP_BASE_NAME=${0##*/}
87-
88-
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
89-
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
88+
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
90+
' "$PWD" ) || exit
9091

9192
# Use the maximum available, or set MAX_FD != -1 to use that value.
9293
MAX_FD=maximum
@@ -133,22 +134,29 @@ location of your Java installation."
133134
fi
134135
else
135136
JAVACMD=java
136-
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137+
if ! command -v java >/dev/null 2>&1
138+
then
139+
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
137140
138141
Please set the JAVA_HOME variable in your environment to match the
139142
location of your Java installation."
143+
fi
140144
fi
141145

142146
# Increase the maximum file descriptors if we can.
143147
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
144148
case $MAX_FD in #(
145149
max*)
150+
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
151+
# shellcheck disable=SC2039,SC3045
146152
MAX_FD=$( ulimit -H -n ) ||
147153
warn "Could not query maximum file descriptor limit"
148154
esac
149155
case $MAX_FD in #(
150156
'' | soft) :;; #(
151157
*)
158+
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
159+
# shellcheck disable=SC2039,SC3045
152160
ulimit -n "$MAX_FD" ||
153161
warn "Could not set maximum file descriptor limit to $MAX_FD"
154162
esac
@@ -193,11 +201,15 @@ if "$cygwin" || "$msys" ; then
193201
done
194202
fi
195203

196-
# Collect all arguments for the java command;
197-
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
198-
# shell script including quotes and variable substitutions, so put them in
199-
# double quotes to make sure that they get re-expanded; and
200-
# * put everything else in single quotes, so that it's not re-expanded.
204+
205+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
206+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
207+
208+
# Collect all arguments for the java command:
209+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
210+
# and any embedded shellness will be escaped.
211+
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
212+
# treated as '${Hostname}' itself on the command line.
201213

202214
set -- \
203215
"-Dorg.gradle.appname=$APP_BASE_NAME" \

‎native-image/microservices/micronaut-hello-rest-gradle/gradlew.bat‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -26,6 +28,7 @@ if "%OS%"=="Windows_NT" setlocal
2628

2729
set DIRNAME=%~dp0
2830
if "%DIRNAME%"=="" set DIRNAME=.
31+
@rem This is normally unused
2932
set APP_BASE_NAME=%~n0
3033
set APP_HOME=%DIRNAME%
3134

@@ -42,11 +45,11 @@ set JAVA_EXE=java.exe
4245
%JAVA_EXE% -version >NUL 2>&1
4346
if %ERRORLEVEL% equ 0 goto execute
4447

45-
echo.
46-
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
47-
echo.
48-
echo Please set the JAVA_HOME variable in your environment to match the
49-
echo location of your Java installation.
48+
echo. 1>&2
49+
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
50+
echo. 1>&2
51+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
52+
echo location of your Java installation. 1>&2
5053

5154
goto fail
5255

@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
5659

5760
if exist "%JAVA_EXE%" goto execute
5861

59-
echo.
60-
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
61-
echo.
62-
echo Please set the JAVA_HOME variable in your environment to match the
63-
echo location of your Java installation.
62+
echo. 1>&2
63+
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
64+
echo. 1>&2
65+
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
66+
echo location of your Java installation. 1>&2
6467

6568
goto fail
6669

0 commit comments

Comments
 (0)