diff --git a/build.gradle b/build.gradle index 86362e86676..460141dc97d 100644 --- a/build.gradle +++ b/build.gradle @@ -427,8 +427,6 @@ defineProperty("libAVRepositoryURL", "https://github.com/libav/libav/archive") defineProperty("FFmpegRepositoryURL", "https://www.ffmpeg.org/releases/") defineProperty("icuRepositoryURL", "https://github.com/unicode-org/icu/releases/") -defineProperty("icuVersion", "74.2") - loadProperties("$projectDir/build.properties") def supplementalPreBuildFile = file("$closedDir/closed-pre-build.gradle"); @@ -500,11 +498,11 @@ defineProperty("BUILD_TOOLS_DOWNLOAD_SCRIPT", "") // Define the SWT.jar that we are going to have to download during the build process based // on what platform we are compiling from (not based on our target). ext.SWT_FILE_NAME = - IS_MAC && IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.aarch64_3.124.200.v20231113-1355" : - IS_MAC && !IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.x86_64_3.124.200.v20231113-1355" : - IS_WINDOWS ? "org.eclipse.swt.win32.win32.x86_64_3.124.200.v20231113-1355" : - IS_LINUX && IS_AARCH64 ? "org.eclipse.swt.gtk.linux.aarch64_3.124.200.v20231113-1355" : - IS_LINUX && !IS_AARCH64 ? "org.eclipse.swt.gtk.linux.x86_64_3.124.200.v20231113-1355" : "" + IS_MAC && IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.aarch64_${swtVersion}" : + IS_MAC && !IS_AARCH64 ? "org.eclipse.swt.cocoa.macosx.x86_64_${swtVersion}" : + IS_WINDOWS ? "org.eclipse.swt.win32.win32.x86_64_${swtVersion}" : + IS_LINUX && IS_AARCH64 ? "org.eclipse.swt.gtk.linux.aarch64_${swtVersion}" : + IS_LINUX && !IS_AARCH64 ? "org.eclipse.swt.gtk.linux.x86_64_${swtVersion}" : "" // Specifies whether to run full tests (true) or smoke tests (false) defineProperty("FULL_TEST", "false") @@ -2108,7 +2106,7 @@ allprojects { repositories { mavenCentral() ivy { - url "https://download.eclipse.org/eclipse/updates/4.30/R-4.30-202312010110/plugins/" + url "https://download.eclipse.org/eclipse/updates/${eclipseUpdatesiteVersion}/plugins/" metadataSources { artifact() } @@ -2143,7 +2141,7 @@ allprojects { } if (JFX_DEPS_URL == "" && IS_COMPILE_WEBKIT) { - def icuReleaseVersion = icuVersion.replaceAll('\\.', '-') + def icuReleaseVersion = "${icuVersion}".replaceAll('\\.', '-') repositories { ivy { url icuRepositoryURL @@ -2182,18 +2180,18 @@ allprojects { // By default all of our projects require junit for testing so we can just // setup this dependency here. dependencies { - testImplementation group: "junit", name: "junit", version: "4.13.2" - testImplementation group: "org.hamcrest", name: "hamcrest-core", version: "1.3" - testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "5.8.1" - testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "5.8.1" - testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "5.8.1" - testImplementation group: "org.opentest4j", name: "opentest4j", version: "1.2.0" - testImplementation group: "org.apiguardian", name: "apiguardian-api", version: "1.1.2" - testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "5.8.1" - testRuntimeOnly group: "org.junit.platform", name: "junit-platform-commons", version: "1.8.1" - testRuntimeOnly group: "org.junit.platform", name: "junit-platform-engine", version: "1.8.1" - testRuntimeOnly group: "org.junit.platform", name: "junit-platform-launcher", version: "1.8.1" - testRuntimeOnly group: "org.junit.vintage", name: "junit-vintage-engine", version: "5.8.1" + testImplementation group: "junit", name: "junit", version: "${junitVersion}" + testImplementation group: "org.hamcrest", name: "hamcrest-core", version: "${hamcrestVersion}" + testImplementation group: "org.junit.jupiter", name: "junit-jupiter", version: "${junitJupiterVersion}" + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-api", version: "${junitJupiterVersion}" + testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: "${junitJupiterVersion}" + testImplementation group: "org.opentest4j", name: "opentest4j", version: "${opentest4jVersion}" + testImplementation group: "org.apiguardian", name: "apiguardian-api", version: "${apiguardianVersion}" + testRuntimeOnly group: "org.junit.jupiter", name: "junit-jupiter-engine", version: "${junitJupiterVersion}" + testRuntimeOnly group: "org.junit.platform", name: "junit-platform-commons", version: "${junitPlatformVersion}" + testRuntimeOnly group: "org.junit.platform", name: "junit-platform-engine", version: "${junitPlatformVersion}" + testRuntimeOnly group: "org.junit.platform", name: "junit-platform-launcher", version: "${junitPlatformVersion}" + testRuntimeOnly group: "org.junit.vintage", name: "junit-vintage-engine", version: "${junitJupiterVersion}" if (BUILD_CLOSED && DO_JCOV) { testImplementation name: "jcov" @@ -2380,7 +2378,7 @@ project(":graphics") { } dependencies { - antlr group: "org.antlr", name: "antlr4", version: "4.7.2", classifier: "complete" + antlr group: "org.antlr", name: "antlr4", version: "${antlr4Version}", classifier: "complete" testImplementation project(":base").sourceSets.test.output implementation project(':base') } @@ -2783,7 +2781,7 @@ project(":graphics") { libsDir.mkdirs(); def allLibsPresent = true - def libNames = [ "antlr4-4.7.2-complete.jar" ] + def libNames = [ "antlr4-${antlr4Version}-complete.jar" ] libNames.each { name -> File f = new File(libsDir, name) if (!f.exists()) allLibsPresent = false @@ -2794,7 +2792,7 @@ project(":graphics") { copy { into libsDir from f.getParentFile() - include "**/antlr4-4.7.2-complete.jar" + include "**/antlr4-${antlr4Version}-complete.jar" includeEmptyDirs = false } } @@ -3728,7 +3726,7 @@ project(":web") { dependencies { if (IS_COMPILE_WEBKIT) { - def icuFileVersion = icuVersion.replaceAll('\\.', '_') + def icuFileVersion = "${icuVersion}".replaceAll('\\.', '_') icu name: "icu4c-${icuFileVersion}-data-bin-l", ext: "zip" } implementation project(":base") @@ -4713,12 +4711,11 @@ project(":apps") { // The apps build is Ant based, we will exec ant from gradle. // Download the Lucene libraries needed for the Ensemble8 app - def luceneVersion = "7.7.3" getConfigurations().create("lucene"); dependencies { - lucene group: "org.apache.lucene", name: "lucene-core", version: luceneVersion - lucene group: "org.apache.lucene", name: "lucene-grouping", version: luceneVersion - lucene group: "org.apache.lucene", name: "lucene-queryparser", version: luceneVersion + lucene group: "org.apache.lucene", name: "lucene-core", version: "${luceneVersion}" + lucene group: "org.apache.lucene", name: "lucene-grouping", version: "${luceneVersion}" + lucene group: "org.apache.lucene", name: "lucene-queryparser", version: "${luceneVersion}" } // Copy Lucene libraries into the Ensemble8/lib directory diff --git a/build.properties b/build.properties index 953058a6cb9..bd8423a9615 100644 --- a/build.properties +++ b/build.properties @@ -106,3 +106,18 @@ jfx.build.macosx.xcode.version=Xcode14.3.1+1.0 jfx.build.cmake.version=3.22.3 jfx.build.ninja.version=1.8.2 jfx.build.ant.version=1.10.5 + +# Dependencies +eclipse.updatesite.version=4.30/R-4.30-202312010110 +swt.version=3.124.200.v20231113-1355 + +junit.version=4.13.2 +junit.jupiter.version=5.8.1 +junit.platform.version=1.8.1 +hamcrest.version=1.3 +opentest4j.version=1.2.0 +apiguardian.version=1.1.2 + +icu.version=74.2 +antlr4.version=4.7.2 +lucene.version=7.7.3 \ No newline at end of file