Skip to content

Add Apple Silicon build workaround #131

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chrisrueger wants to merge 3 commits into
base: 2.3-gae
Choose a base branch
from
+17 −4
Draft

Add Apple Silicon build workaround #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
83bf98e
Add Apple Silicon build workaround
chrisrueger May 29, 2026
135e32f
Revert "Add Apple Silicon build workaround"
chrisrueger Jun 1, 2026
12418b5
Make core9/core16 Java versions configurable
chrisrueger Jun 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,15 @@ group = "org.freemarker"

val fmExt = freemarkerRoot


val core9JavaVersion = providers
.gradleProperty("freemarker.core9.javaVersion")
.get()

val core16JavaVersion = providers
.gradleProperty("freemarker.core16.javaVersion")
.get()

tasks.withType<JavaCompile>().configureEach {
options.encoding = "UTF-8"
}
Expand All @@ -61,8 +70,8 @@ freemarkerRoot {
configureSourceSet("jython20")
configureSourceSet("jython22")
configureSourceSet("jython25") { enableTests() }
configureSourceSet("core9", "9") { enableTests() }
configureSourceSet("core16", "16") {
configureSourceSet("core9", core9JavaVersion) { enableTests() }
configureSourceSet("core16", core16JavaVersion) {
enableTests();
addDependencySourceSet("core9");
}
Expand Down
8 changes: 6 additions & 2 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,14 @@

# JDK version used for compiling, except for Source Sets where a specific version is set in build.gradle.kts.
freemarker.javaVersion=8
# JDK version used for compiling the Java 9 MR-JAR source set
freemarker.core9.javaVersion=11
# JDK version used for compiling the Java 16 MR-JAR source set
freemarker.core16.javaVersion=17
# JDK version for running javadoc
freemarker.javadoc.javaVersion=16
freemarker.javadoc.javaVersion=17
# JDK version for running JUnit tests
freemarker.test.javaVersion=16
freemarker.test.javaVersion=17

# Method used when generating the *.asc file, one of: none, gradle_properties, gpg_command
freemarker.signMethod=none
Expand Down