Merge pull request #667 from ethereum/java_upgrade

Upgrade Java toolchain
ethereum · Aug 17, 2022 · b36789a · b36789a
2 parents 32fc145 + e433f41
commit b36789a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 16 deletions.
diff --git a/bindings/java/build.gradle b/bindings/java/build.gradle
@@ -1,21 +1,19 @@
 // EVMC: Ethereum Client-VM Connector API.
-// Copyright 2019-2020 The EVMC Authors.
+// Copyright 2019 The EVMC Authors.
 // Licensed under the Apache License, Version 2.0.
 
 plugins {
-    id 'com.diffplug.gradle.spotless' version '3.29.0'
+    id 'com.diffplug.spotless' version '6.9.1'
 }
 apply from: "${rootDir}/wrapper.gradle"
 allprojects {
     apply plugin: 'java-library'
     repositories {
         google()
-        jcenter()
         mavenCentral()
     }
     sourceCompatibility = '11'
-    targetCompatibility = '11'
-    apply plugin: 'com.diffplug.gradle.spotless'
+    apply plugin: 'com.diffplug.spotless'
     spotless {
         java {
             // This path needs to be relative to each project
@@ -38,7 +36,7 @@ subprojects {
         maxParallelForks = (System.getenv('GRADLE_MAX_TEST_FORKS') ?: (Runtime.runtime.availableProcessors().intdiv(2) ?: 1)).toInteger()
         useJUnitPlatform()
         reports {
-            junitXml.enabled = true
+            junitXml.required = true
         }
     }
 }
diff --git a/bindings/java/wrapper.gradle b/bindings/java/wrapper.gradle
@@ -1,4 +1,4 @@
 task setup(type: Wrapper) {
     description = "Download the gradle wrapper and requisite files. Overwrites existing wrapper files."
-    gradleVersion = "6.3"
+    gradleVersion = "7.5.1"
 }
diff --git a/circle.yml b/circle.yml
@@ -295,27 +295,25 @@ jobs:
 
   bindings-java:
     docker:
-      - image: circleci/openjdk:13-buster
+      - image: cimg/openjdk:18.0
     environment:
       CMAKE_OPTIONS: -DEVMC_JAVA=ON
     steps:
-      - run:
-          name: "Install CMake"
-          command: |
-            sudo apt -qq update
-            sudo apt -yq install cmake
       - checkout
       - build
       - test
       - run:
           name: "Java Lint (spotlessCheck)"
-          command: cd bindings/java && make lint
+          working_directory: bindings/java
+          command: make lint
       - run:
           name: "Java Build"
-          command: cd bindings/java && make clean build
+          working_directory: bindings/java
+          command: make clean build
       - run:
           name: "Java Test"
-          command: cd bindings/java && make test
+          working_directory: bindings/java
+          command: make test
 
   bindings-rust:
     docker: