diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4cdc4dc3f55..169aef806ca 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: ['8', '11', '14'] + java: ['11', '14'] env: WORKSPACE: ${{ github.workspace }} GRADLE_OPTS: -Xmx1500m -Dfile.encoding=UTF-8 diff --git a/build.gradle b/build.gradle index 35c8fe8bbc3..454b03832a3 100644 --- a/build.gradle +++ b/build.gradle @@ -419,8 +419,8 @@ subprojects { project -> if(project.name == 'grails-dependencies') return if(project.name == 'grails-bom') return - sourceCompatibility = "1.8" - targetCompatibility = "1.8" + sourceCompatibility = "1.11" + targetCompatibility = "1.11" if(project.name =~ /^(grails-web|grails-plugin-|grails-test-suite|grails-test)/) { dependencies { diff --git a/grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy b/grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy index 4bd1fc8af2f..471df72e701 100644 --- a/grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy +++ b/grails-bootstrap/src/main/groovy/org/grails/io/support/MainClassFinder.groovy @@ -170,7 +170,7 @@ class MainClassFinder { boolean found = false MainMethodFinder() { - super(Opcodes.ASM4) + super(Opcodes.ASM7) } @Override diff --git a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java index af373cb0d84..dae4bdd8d9e 100644 --- a/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java +++ b/grails-core/src/main/groovy/org/grails/compiler/injection/GrailsAwareInjectionOperation.java @@ -120,7 +120,7 @@ private static void initializeState() { final ClassReader classReader = new ClassReader(inputStream); final String astTransformerClassName = AstTransformer.class.getSimpleName(); final ClassLoader finalClassLoader = classLoader; - classReader.accept(new ClassVisitor(Opcodes.ASM4) { + classReader.accept(new ClassVisitor(Opcodes.ASM7) { @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { try {