Skip to content

Commit 0ad8f2c

Browse files
committed
Log JDK version information at the start of every build
It used to be skipped sometimes due to the Gradle cache.
1 parent 0c7fa8c commit 0ad8f2c

File tree

3 files changed

+20
-44
lines changed

3 files changed

+20
-44
lines changed

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionPlugin.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ public void apply(Project project) {
6060
);
6161

6262
project.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
63-
JdkVersionsLogging.logVersions( jdkVersionConfig );
6463
}
6564

6665
@NotNull

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionSettingsPlugin.java

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55
package org.hibernate.orm.toolchains;
66

77
import org.gradle.StartParameter;
8+
import org.gradle.api.Action;
89
import org.gradle.api.JavaVersion;
910
import org.gradle.api.Plugin;
1011
import org.gradle.api.initialization.Settings;
12+
import org.gradle.api.invocation.Gradle;
1113
import org.gradle.jvm.toolchain.JavaLanguageVersion;
12-
1314
import org.jetbrains.annotations.NotNull;
1415

1516
import static org.hibernate.orm.toolchains.JdkVersionConfig.MAIN_JDK_VERSION;
@@ -47,7 +48,24 @@ public void apply(Settings settings) {
4748

4849
settings.getGradle().getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
4950
settings.getExtensions().add( JdkVersionConfig.DSL_NAME, jdkVersionConfig );
50-
JdkVersionsLogging.logVersions( jdkVersionConfig );
51+
52+
// Log version information at the start of every build.
53+
// `projectsLoaded` allows us to bypass the Gradle cache, and we want that.
54+
settings.getGradle().projectsLoaded( new Action<Gradle>() {
55+
@Override
56+
public void execute(Gradle gradle) {
57+
final String implicitExplicitString = jdkVersionConfig.isExplicit() ? "explicit" : "implicit";
58+
59+
System.out.println(
60+
"Java versions for main code: " + jdkVersionConfig.getMain()
61+
+ " (" + implicitExplicitString + ")"
62+
);
63+
System.out.println(
64+
"Java versions for test code: " + jdkVersionConfig.getTest()
65+
+ " (" + implicitExplicitString + ")"
66+
);
67+
}
68+
} );
5169
}
5270

5371
@NotNull

local-build-plugins/src/main/java/org/hibernate/orm/toolchains/JdkVersionsLogging.java

Lines changed: 0 additions & 41 deletions
This file was deleted.

0 commit comments

Comments
 (0)