Cynosphere/bcv-vf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #454 from ThexXTURBOXx/master

Browse source 
Fix dex2jar issues
This commit is contained in:
Konloch 2022-10-18 14:29:33 -07:00 committed by GitHub
commit 77521a23b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
.github/workflows/maven.yml vendored
View file

@ -17,21 +17,21 @@ jobs:
java: [ '8', '11', '17' ] # LTS versions java: [ '8', '11', '17' ] # LTS versions
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Set up JDK ${{ matrix.java }} - name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2 uses: actions/setup-java@v3
with: with:
java-version: ${{ matrix.java }} java-version: ${{ matrix.java }}
distribution: 'temurin' distribution: 'temurin'
- name: Build with Maven - name: Build with Maven
run: mvn -B package --file pom.xml run: mvn -B package --file pom.xml
- name: Extract Maven project version - name: Extract Maven project version
run: echo ::set-output name=version::$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec) run: echo "bcv_version=$(mvn -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)" >> $GITHUB_ENV
id: project id: project
- name: 'Upload Artifact' - name: 'Upload Artifact'
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
if: ${{ matrix.java == '8' }} if: ${{ matrix.java == '8' }}
with: with:
name: Bytecode-Viewer-${{ steps.project.outputs.version }}-SNAPSHOT name: Bytecode-Viewer-${{ env.bcv_version }}-SNAPSHOT
path: target/Bytecode-Viewer-${{ steps.project.outputs.version }}.jar path: target/Bytecode-Viewer-${{ env.bcv_version }}.jar
retention-days: 90 retention-days: 90

34
pom.xml
View file

@ -16,7 +16,7 @@
<annotations.version>23.0.0</annotations.version> <annotations.version>23.0.0</annotations.version>
<antlr4.version>4.9.3</antlr4.version> <antlr4.version>4.9.3</antlr4.version>
<apktool.version>2.6.1</apktool.version> <apktool.version>2.6.1</apktool.version>
<asm.version>9.3</asm.version> <asm.version>9.4</asm.version>
<bined.version>0.2.0</bined.version> <bined.version>0.2.0</bined.version>
<byteanalysis.version>1.0bcv</byteanalysis.version> <byteanalysis.version>1.0bcv</byteanalysis.version>
<cfr.version>0.152</cfr.version> <cfr.version>0.152</cfr.version>
@ -27,11 +27,11 @@
<commons-compress.version>1.21</commons-compress.version> <commons-compress.version>1.21</commons-compress.version>
<commons-io.version>2.11.0</commons-io.version> <commons-io.version>2.11.0</commons-io.version>
<commons-lang3.version>3.12.0</commons-lang3.version> <commons-lang3.version>3.12.0</commons-lang3.version>
<commons-text.version>1.9</commons-text.version> <commons-text.version>1.10.0</commons-text.version>
<darklaf.version>3.0.1</darklaf.version> <darklaf.version>3.0.2</darklaf.version>
<darklaf-extensions-rsta.version>0.4.1</darklaf-extensions-rsta.version> <darklaf-extensions-rsta.version>0.4.1</darklaf-extensions-rsta.version>
<decompiler-fernflower.version>6.0.0.Final</decompiler-fernflower.version> <decompiler-fernflower.version>6.0.0.Final</decompiler-fernflower.version>
<dex2jar.version>v52</dex2jar.version> <dex2jar.version>v56</dex2jar.version>
<fernflower.version>e0d44f4</fernflower.version> <fernflower.version>e0d44f4</fernflower.version>
<gson.version>2.9.1</gson.version> <gson.version>2.9.1</gson.version>
<guava.version>31.1-jre</guava.version> <guava.version>31.1-jre</guava.version>
@ -43,11 +43,11 @@
<objenesis.version>3.3</objenesis.version> <objenesis.version>3.3</objenesis.version>
<paged-data.version>0.2.0</paged-data.version> <paged-data.version>0.2.0</paged-data.version>
<procyon.version>0.6.0</procyon.version> <procyon.version>0.6.0</procyon.version>
<rsyntaxtextarea.version>3.2.0</rsyntaxtextarea.version> <rsyntaxtextarea.version>3.3.0</rsyntaxtextarea.version>
<semantic-version.version>2.1.1</semantic-version.version> <semantic-version.version>2.1.1</semantic-version.version>
<slf4j.version>2.0.0</slf4j.version> <slf4j.version>2.0.3</slf4j.version>
<smali.version>2.5.2</smali.version> <smali.version>2.5.2</smali.version>
<snakeyaml.version>1.32</snakeyaml.version> <snakeyaml.version>1.33</snakeyaml.version>
<treelayout.version>1.0.3</treelayout.version> <treelayout.version>1.0.3</treelayout.version>
<webp-imageio.version>0.2.2</webp-imageio.version> <webp-imageio.version>0.2.2</webp-imageio.version>
<xpp3.version>1.1.4c</xpp3.version> <xpp3.version>1.1.4c</xpp3.version>
@ -421,6 +421,26 @@
<exclude>META-INF/MANIFEST.MF</exclude> <exclude>META-INF/MANIFEST.MF</exclude>
</excludes> </excludes>
</filter> </filter>
<!-- Ignore all ASM-related files from d2j-external but MCTLE fix -->
<filter>
<artifact>com.github.ThexXTURBOXx.dex2jar:d2j-external</artifact>
<excludeDefaults>true</excludeDefaults>
<includes>
<include>com/android/**</include>
<include>api_database/**</include>
<include>META-INF/services/**</include>
<include>LICENSE</include>
<include>r8-version.properties</include>
<include>org/objectweb/asm/MethodWriter.class</include>
</includes>
</filter>
<!-- Ignore original MethodWriter for MCTLE fix above -->
<filter>
<artifact>org.ow2.asm:asm</artifact>
<excludes>
<exclude>org/objectweb/asm/MethodWriter.class</exclude>
</excludes>
</filter>
</filters> </filters>
<transformers> <transformers>
<transformer <transformer