diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index bae73b5..c095813 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -12,13 +12,13 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-java@v3 with: - distribution: temurin - java-version: 8 + distribution: zulu + java-version: 11 - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x - name: Setup Gradle uses: gradle/gradle-build-action@v2 diff --git a/.sdkmanrc b/.sdkmanrc new file mode 100644 index 0000000..62653eb --- /dev/null +++ b/.sdkmanrc @@ -0,0 +1 @@ +java=11.0.20-zulu diff --git a/build.gradle b/build.gradle index 2fab196..411670c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,9 @@ import groovy.swing.SwingBuilder plugins { - id 'me.champeau.gradle.jmh' version '0.5.0' + id 'me.champeau.jmh' version '0.7.1' id 'net.researchgate.release' version '2.6.0' - id 'com.moowork.node' version '1.3.1' + id 'com.github.node-gradle.node' version '7.0.0' id 'jacoco' id 'java-library' id 'maven-publish' @@ -15,21 +15,20 @@ repositories { mavenCentral() } -apply plugin: 'me.champeau.gradle.jmh' +apply plugin: 'me.champeau.jmh' apply plugin: 'java' apply plugin: 'eclipse' apply plugin: 'jacoco' group = 'com.squarespace.cldr-engine' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +sourceCompatibility = 11 +targetCompatibility = 11 project.ext { - ccVersion = '1.0.6' - gsonVersion = '2.8.6' - lombokVersion = '1.18.24' - testngVersion = '7.1.0' + gsonVersion = '2.10.1' + lombokVersion = '1.18.28' + testngVersion = '7.8.0' buildDate = new java.util.Date() buildCommit = ('git rev-parse HEAD').execute().text.trim() @@ -52,7 +51,7 @@ dependencies { } jmh { - jmhVersion '1.23' + jmhVersion = '1.23' forceGC = true includeTests = false zip64 = true @@ -73,7 +72,7 @@ eclipse { } wrapper { - gradleVersion = '6.8.2' + gradleVersion = '8.3' } clean { @@ -87,8 +86,8 @@ test { jacocoTestReport { reports { - xml.enabled false - csv.enabled false + xml.required = true + csv.required = true html.destination file("${buildDir}/jacoco-report") } } @@ -109,7 +108,7 @@ release { } node { - version = '12.14.1' + version = '20.6.1' } task yarnInstall(type: YarnTask) { diff --git a/codegen/package.json b/codegen/package.json index 25c53cc..b012e83 100644 --- a/codegen/package.json +++ b/codegen/package.json @@ -19,23 +19,23 @@ "unlink-all": "ls --color=none node_modules/@phensley | xargs -I % yarn unlink @phensley/%" }, "devDependencies": { - "@phenomnomnominal/tsquery": "^5.0.1", + "@phenomnomnominal/tsquery": "^6.1.3", "@phensley/cldr": "1.7.2", "@phensley/cldr-compiler": "1.7.2", "@phensley/unit-converter": "1.7.2", - "@types/jest": "^29.5.2", - "@types/node": "^20.4.0", - "@typescript-eslint/eslint-plugin": "^5.61.0", - "@typescript-eslint/parser": "^5.61.0", - "eslint": "^8.44.0", - "eslint-config-prettier": "^8.8.0", - "eslint-plugin-prettier": "^4.2.1", - "fast-glob": "^3.3.0", - "jest": "^29.6.1", + "@types/jest": "^29.5.4", + "@types/node": "^20.6.0", + "@typescript-eslint/eslint-plugin": "^6.6.0", + "@typescript-eslint/parser": "^6.6.0", + "eslint": "^8.49.0", + "eslint-config-prettier": "^9.0.0", + "eslint-plugin-prettier": "^5.0.0", + "fast-glob": "^3.3.1", + "jest": "^29.6.4", "rimraf": "^5.0.1", "ts-extractor": "^3.1.5", "ts-jest": "^29.1.1", "ts-node": "^10.9.1", - "typescript": "5.1.x" + "typescript": "5.2.x" } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f3d88b1..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a56324..db9a6b8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 2fe81a7..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -82,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -129,6 +130,7 @@ fi if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath