Outcomment code that requires ASM 9 until release. Fix build.

raphw · Sep 18, 2020 · 608bf67 · 608bf67
1 parent 383f082
commit 608bf67
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 21 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,14 +27,13 @@ jobs:
       matrix:
         os: [ubuntu-18.04, macOS-10.15, windows-2019]
         java: [8, 11, 14]
-        architecture: [x86, x64]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-java@v1
         with:
           java-version: ${{ matrix.java }}
-          architecture: ${{ matrix.architecture }}
+          architecture: x64
       - name: Build project
         run: ./mvnw verify -Pintegration -Pjava${{ matrix.java }}
   hotspot-unsupported:
@@ -88,7 +87,7 @@ jobs:
           java-version: 8
           architecture: x64
       - name: Build project
-        run: ./mvnw jacoco:prepare-agent verify jacoco:report coveralls:report -DrepoToken=${{ secrets.coveralls }} -Pintegration
+        run: ./mvnw jacoco:prepare-agent verify jacoco:report coveralls:report -DrepoToken=${{ secrets.coveralls }} -Pintegration
   release:
     name: Release new version
     runs-on: ubuntu-18.04
@@ -106,4 +105,4 @@ jobs:
           git clone ${{ github.repositoryUrl }} .
           git config user.name "${{ github.event.head_commit.committer.name }}"
           git config user.email "${{ github.event.head_commit.committer.email }}"
-          ./mvnw -B -s .mvn/release.settings.xml release:prepare release:perform -Drepository.url=https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git -Dbintray.username=raphw -Dbintray.password=${{ secrets.bintray_password }} -Dgpg.passphrase=${{ secrets.gpg_passphrase }} -Dgpg.keyname=B4AC8CDC141AF0AE468D16921DA784CCB5C46DD5 -Dgradle.key=${{ secrets.gradle_key }} -Dgradle.secret=${{ secrets.gradle_secret }}
+          ./mvnw -B -s .mvn/release.settings.xml release:prepare release:perform -Drepository.url=https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}.git -Dbintray.username=raphw -Dbintray.password=${{ secrets.bintray_password }} -Dgpg.passphrase=${{ secrets.gpg_passphrase }} -Dgpg.keyname=B4AC8CDC141AF0AE468D16921DA784CCB5C46DD5 -Dgradle.key=${{ secrets.gradle_key }} -Dgradle.secret=${{ secrets.gradle_secret }}
diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java b/byte-buddy-dep/src/main/java/net/bytebuddy/ClassFileVersion.java
@@ -119,7 +119,7 @@ public class ClassFileVersion implements Comparable<ClassFileVersion> {
     /**
      * The class file version of Java 16.
      */
-    public static final ClassFileVersion JAVA_V16 = new ClassFileVersion(Opcodes.V16);
+    public static final ClassFileVersion JAVA_V16 = new ClassFileVersion(Opcodes.V15 + 1);
 
     /**
      * A version locator for the executing JVM.

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java b/byte-buddy-dep/src/main/java/net/bytebuddy/dynamic/scaffold/TypeWriter.java
@@ -2323,11 +2323,11 @@ record = false;
                 super.visit(version, modifiers, name, signature, superName, interfaces);
             }
 
-            @Override
+            /*@Override
             public void visitPermittedSubclass(String permittedSubclass) {
                 constraint.assertPermittedSubclass();
                 super.visitPermittedSubclass(permittedSubclass);
-            }
+            }*/
 
             @Override
             public AnnotationVisitor visitAnnotation(String descriptor, boolean visible) {
@@ -4862,19 +4862,19 @@ protected void onNestHost() {
                         }
                     }
 
-                    @Override
+                    /*@Override
                     protected void onVisitPermittedSubclass(String permittedSubclass) {
                         if (permittedSubclasses.remove(permittedSubclass)) {
                             cv.visitPermittedSubclass(permittedSubclass);
                         }
-                    }
+                    }*/
 
-                    @Override
+                    /*@Override
                     protected void onAfterPermittedSubclasses() {
                         for (String permittedSubclass : permittedSubclasses) {
                             cv.visitPermittedSubclass(permittedSubclass);
                         }
-                    }
+                    }*/
 
                     @Override
                     protected void onVisitOuterClass(String owner, String name, String descriptor) {
@@ -5729,9 +5729,9 @@ protected UnresolvedType create(TypeInitializer typeInitializer, ClassDumpAction
                 if (!instrumentedType.isNestHost()) {
                     classVisitor.visitNestHost(instrumentedType.getNestHost().getInternalName());
                 }
-                for (TypeDescription typeDescription : instrumentedType.getPermittedSubclasses()) {
+                /*for (TypeDescription typeDescription : instrumentedType.getPermittedSubclasses()) {
                     classVisitor.visitPermittedSubclass(typeDescription.getInternalName());
-                }
+                }*/
                 MethodDescription.InDefinedShape enclosingMethod = instrumentedType.getEnclosingMethod();
                 if (enclosingMethod != null) {
                     classVisitor.visitOuterClass(enclosingMethod.getDeclaringType().getInternalName(),

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java b/byte-buddy-dep/src/main/java/net/bytebuddy/pool/TypePool.java
@@ -7813,10 +7813,10 @@ public RecordComponentVisitor visitRecordComponent(String name, String descripto
                 return new RecordComponentExtractor(name, descriptor, signature);
             }
 
-            @Override
+            /*@Override
             public void visitPermittedSubclass(String permittedSubclass) {
                 permittedSubclasses.add(permittedSubclass);
-            }
+            }*/
 
             /**
              * Creates a type description from all data that is currently collected. This method should only be invoked

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/OpenedClassReader.java
@@ -53,7 +53,7 @@ public class OpenedClassReader {
             experimental = false;
         }
         EXPERIMENTAL = experimental;
-        ASM_API = Opcodes.ASM9;
+        ASM_API = Opcodes.ASM8;
     }
 
     /**

diff --git a/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java b/byte-buddy-dep/src/main/java/net/bytebuddy/utility/visitor/MetadataAwareClassVisitor.java
@@ -162,7 +162,7 @@ protected void onVisitNestHost(String nestHost) {
         super.visitNestHost(nestHost);
     }
 
-    @Override
+    /*@Override
     public final void visitPermittedSubclass(String permittedSubclass) {
         onVisitPermittedSubclass(permittedSubclass);
     }
@@ -171,10 +171,10 @@ public final void visitPermittedSubclass(String permittedSubclass) {
      * An order-sensitive invocation of {@code ClassVisitor#visitPermittedSubclass}.
      *
      * @param permittedSubclass The internal name of the permitted subclass.
-     */
+     *//*
     protected void onVisitPermittedSubclass(String permittedSubclass) {
         super.visitPermittedSubclass(permittedSubclass);
-    }
+    }*/
 
     @Override
     public final void visitOuterClass(String owner, String name, String descriptor) {

diff --git a/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java b/byte-buddy-dep/src/test/java/net/bytebuddy/ClassFileVersionKnownVersionsTest.java
@@ -73,7 +73,7 @@ public static Collection<Object[]> data() {
                 {13, 13, Arrays.asList("1.13", "13"), Opcodes.V13, (short) 57, (short) 0, true, true, true},
                 {14, 14, Arrays.asList("1.14", "14"), Opcodes.V14, (short) 58, (short) 0, true, true, true},
                 {15, 15, Arrays.asList("1.15", "15"), Opcodes.V15, (short) 59, (short) 0, true, true, true},
-                {16, 16, Arrays.asList("1.16", "16"), Opcodes.V16, (short) 60, (short) 0, true, true, true}
+                {16, 16, Arrays.asList("1.16", "16"), Opcodes.V15 + 1, (short) 60, (short) 0, true, true, true}
         });
     }
 

diff --git a/pom.xml b/pom.xml
@@ -60,7 +60,7 @@
         <bytecode.test.version>1.6</bytecode.test.version>
         <pitest.target>net.bytebuddy</pitest.target>
         <asm.url>https://asm.ow2.io</asm.url>
-        <version.asm>9.0-beta</version.asm>
+        <version.asm>8.0.1</version.asm>
         <version.junit>4.13</version.junit>
         <version.mockito>2.23.0</version.mockito>
         <version.plugin.clean>3.0.0</version.plugin.clean>