fix(gui): make the Split view checkbox correctly toggle between both modes (PR #2801)

fix: back to the old correct resourceID calculation

.editorconfig

@@ -7,11 +7,23 @@ insert_final_newline = true
 
 indent_style = tab
 tab_width = 4
-continuation_indent_size = 8 #IntelliJ Idea specific workaround
 
 charset = utf-8
 trim_trailing_whitespace = true
 
+[*.java]
+ij_java_continuation_indent_size = 8
+ij_java_use_single_class_imports = true
+ij_java_class_count_to_use_import_on_demand = 99
+ij_java_names_count_to_use_import_on_demand = 99
+ij_java_packages_to_use_import_on_demand = *
+
+[*.kt]
+ij_kotlin_continuation_indent_size = 8
+ij_kotlin_name_count_to_use_star_import = 99
+ij_kotlin_name_count_to_use_star_import_for_members = 99
+ij_kotlin_packages_to_use_import_on_demand = *
+
 [*.yml]
 indent_style = space
 indent_size = 2

.gitattributes

@@ -0,0 +1,12 @@
+*       text=auto eol=lf
+
+*.java  text eol=lf diff=java
+*.kt    text eol=lf diff=kotlin
+*.kts   text eol=lf diff=kotlin
+
+gradlew text eol=lf
+
+*.bat   text eol=crlf
+
+*.png   binary
+*.jar   binary

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/decompilation-error.md

@@ -1,19 +0,0 @@
----
-name: Decompilation error
-about: Create a report to help us improve jadx decompiler
-title: "[core]"
-labels: Core, bug
-assignees: ''
-
----
-
-**Checks before report**
-- check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
-- search existing issues by exception message
-
-**Describe error**
-- full name of method or class with error
-- full java stacktrace (no need to copy method fallback code (commented pseudocode))
-- **IMPORTANT!** attach or provide link to apk file (double check apk version)
-
-  **Note**: GitHub don't allow attach files with `.apk` extension, but you can change extension by adding `.zip` at the end :)

.github/ISSUE_TEMPLATE/decompilation-issue.yml

@@ -0,0 +1,40 @@
+name: Decompilation issue
+description: Create a report to help us improve jadx decompiler
+title: '[core] '
+labels:
+  - Core
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Checks before submit**
+        - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
+        - try [latest unstable build](https://nightly.link/skylot/jadx/workflows/build-artifacts/master), maybe issue already fixed
+        - search existing issues by exception message
+  - type: textarea
+    id: details
+    attributes:
+      label: Issue details
+      placeholder: >-
+        Describe issue
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output or stacktrace
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: java
+  - type: textarea
+    id: sample
+    attributes:
+      label: Provide sample and class/method full name
+      description: |
+        - sample: attach or provide a link
+        - full name of class or method with issue
+        - other details which may help to reproduce issue
+  - type: input
+    id: jadx-version
+    attributes:
+      label: Jadx version

.github/ISSUE_TEMPLATE/feature-request.md

@@ -1,10 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for jadx
-title: "[feature]"
-labels: new feature
-assignees: ''
-
----
-
-*Describe your idea:*

.github/ISSUE_TEMPLATE/feature-request.yml

@@ -0,0 +1,13 @@
+name: Feature Request
+description: Suggest an idea for jadx
+title: '[feature] '
+labels:
+  - 'new feature'
+body:
+  - type: textarea
+    id: details
+    attributes:
+      label: Describe your idea
+      placeholder: Feature details
+    validations:
+      required: true

.github/ISSUE_TEMPLATE/jadx-gui-issue.yml

@@ -0,0 +1,43 @@
+name: jadx-gui issue
+description: Create a bug report about issue found in jadx-gui
+title: '[gui] '
+labels:
+  - GUI
+  - bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **Checks before submit**
+        - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
+        - try [latest unstable build](https://nightly.link/skylot/jadx/workflows/build-artifacts/master), maybe issue already fixed
+        - search existing issues by exception message
+  - type: textarea
+    id: details
+    attributes:
+      label: Issue details
+      placeholder: Describe issue and how to reproduce it
+    validations:
+      required: true
+  - type: input
+    id: jadx-version
+    attributes:
+      label: Jadx version
+      placeholder: check `Help->About`
+    validations:
+      required: true
+  - type: input
+    id: java-version
+    attributes:
+      label: Java version
+      placeholder: check `Help->About`
+    validations:
+      required: true
+  - type: checkboxes
+    id: os
+    attributes:
+      label: OS
+      options:
+        - label: Windows
+        - label: Linux
+        - label: macOS

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Set update schedule for GitHub Actions
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.github/workflows/build-artifacts.yml

@@ -0,0 +1,90 @@
+name: Build Artifacts
+
+on:
+  push:
+    branches: [ master, build-test ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+
+      - name: Set jadx version
+        run: |
+          JADX_REV=$(git rev-list --count HEAD)
+          JADX_VERSION="r${JADX_REV}.${GITHUB_SHA:0:7}"
+          echo "JADX_VERSION=$JADX_VERSION" >> $GITHUB_ENV
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build
+        run: ./gradlew dist distWin
+        env:
+          JADX_BUILD_JAVA_VERSION: 11
+
+      - name: Save bundle artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ format('jadx-{0}', env.JADX_VERSION) }}
+          # Waiting fix for https://github.com/actions/upload-artifact/issues/39 to upload zip file
+          # Upload unpacked files for now
+          path: build/jadx/**/*
+          if-no-files-found: error
+          retention-days: 14
+
+      - name: Save Windows bundle artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ format('jadx-gui-{0}-no-jre-win', env.JADX_VERSION) }}
+          # Upload unpacked files for now
+          path: jadx-gui/build/jadx-gui-win/*
+          if-no-files-found: error
+          retention-days: 14
+
+  build-win-bundle:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Set up JDK
+        uses: oracle-actions/setup-java@v1
+        with:
+          release: 25
+
+      - name: Print Java version
+        shell: bash
+        run: java -version
+
+      - name: Set jadx version
+        shell: bash
+        run: |
+          JADX_REV=$(git rev-list --count HEAD)
+          JADX_VERSION="r${JADX_REV}.${GITHUB_SHA:0:7}"
+          echo "JADX_VERSION=$JADX_VERSION" >> $GITHUB_ENV
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build
+        run: ./gradlew dist -PbundleJRE=true
+
+      - name: Save Windows with JRE bundle artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ format('jadx-gui-{0}-with-jre-win', env.JADX_VERSION) }}
+          # Upload unpacked files for now
+          path: jadx-gui/build/jadx-gui-with-jre-win/*
+          if-no-files-found: error
+          retention-days: 14

.github/workflows/build-test.yml

@@ -0,0 +1,31 @@
+name: Build Test
+
+on:
+  push:
+    branches: [ master, stable, build-test ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  tests:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest, windows-latest ]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build
+        run: ./gradlew build dist distWin
+        env:
+          JADX_BUILD_JAVA_VERSION: 11

.github/workflows/build.yml

@@ -1,52 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Set up JDK
-        uses: actions/setup-java@v1
-        with:
-          java-version: 8
-
-      - name: Set jadx version
-        run: |
-          JADX_LAST_TAG=$(git describe --abbrev=0 --tags)
-          JADX_VERSION="${JADX_LAST_TAG:1}.$GITHUB_RUN_NUMBER-${GITHUB_SHA:0:8}"
-          echo "JADX_VERSION=$JADX_VERSION" >> $GITHUB_ENV
-
-      - uses: burrunan/gradle-cache-action@v1
-        name: Build with Gradle
-        env:
-          TERM: dumb
-          TEST_INPUT_PLUGIN: dx
-        with:
-          arguments: clean build dist copyExe --warning-mode=all
-
-      - name: Save bundle artifact
-        if: success() && github.event_name == 'push'
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ format('jadx-{0}', env.JADX_VERSION) }}
-          # Waiting fix for https://github.com/actions/upload-artifact/issues/39 to upload zip file
-          # Upload unpacked files for now
-          path: build/jadx/**/*
-          if-no-files-found: error
-
-      - name: Save exe artifact
-        if: success() && github.event_name == 'push'
-        uses: actions/upload-artifact@v2
-        with:
-          name: ${{ format('jadx-gui-{0}-no-jre-win.exe', env.JADX_VERSION) }}
-          path: build/*.exe
-          if-no-files-found: error

.github/workflows/codeql-analysis.yml

@@ -1,41 +0,0 @@
-name: "CodeQL"
-
-on:
-  push:
-    branches: [master]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [master]
-  schedule:
-    - cron: '0 9 * * 5'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: ['java']
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v2
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        queries: +security-extended
-        languages: ${{ matrix.language }}
-
-    # Don't build tests in jadx-core also skip tests execution and checkstyle tasks
-    - run: |
-        ./gradlew clean build -x checkstyleTest -x checkstyleMain -x test -x ':jadx-core:testClasses'
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

.github/workflows/gradle-wrapper-validation.yml

@@ -1,10 +0,0 @@
-name: "Validate Gradle Wrapper"
-on: [push]
-
-jobs:
-  validation:
-    name: "Validation"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: gradle/wrapper-validation-action@v1

.github/workflows/release.yml

@@ -0,0 +1,92 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+# additional permissions for provided GitHub token to create new release
+permissions:
+  contents: write
+
+jobs:
+  build-release-win-bundle:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up JDK
+        uses: oracle-actions/setup-java@v1
+        with:
+          release: 25
+
+      - name: Set jadx version
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const jadxVersion = context.ref.split('/').pop().substring(1)
+            core.exportVariable('JADX_VERSION', jadxVersion);
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build
+        run: ./gradlew dist -PbundleJRE=true
+
+      - name: Save JRE bundle artifact
+        uses: actions/upload-artifact@v6
+        with:
+          name: ${{ format('jadx-gui-{0}-with-jre-win', env.JADX_VERSION) }}
+          path: ${{ format('build/distWinWithJre/jadx-gui-{0}-with-jre-win.zip', env.JADX_VERSION) }}
+          if-no-files-found: error
+          retention-days: 1
+
+  release:
+    needs: build-release-win-bundle
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up JDK
+        uses: actions/setup-java@v5
+        with:
+          distribution: temurin
+          java-version: 25
+
+      - name: Set jadx version and release name
+        uses: actions/github-script@v8
+        with:
+          script: |
+            const jadxVersion = context.ref.split('/').pop().substring(1)
+            core.exportVariable('JADX_VERSION', jadxVersion);
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v5
+
+      - name: Build
+        run: ./gradlew dist distWin
+        env:
+          JADX_BUILD_JAVA_VERSION: 11
+
+      - name: Download Windows JRE bundle
+        uses: actions/download-artifact@v7
+        with:
+          name: ${{ format('jadx-gui-{0}-with-jre-win', env.JADX_VERSION) }}
+          path: ${{ format('build/jadx-gui-{0}-with-jre-win', env.JADX_VERSION) }}
+
+      - run: |
+          cd build
+          pwd
+          ls -l
+          ls jadx-gui-*-with-jre-win
+          mv jadx-gui-*-with-jre-win/jadx-gui-*-with-jre-win.zip .
+          mv distWin/jadx-gui-*-win.zip .
+          ls -l *.zip
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        with:
+          name: ${{ env.JADX_VERSION }}
+          draft: true
+          fail_on_unmatched_files: true
+          files: build/jadx-*.zip

.gitignore

@@ -21,18 +21,23 @@ build/
 classes/
 idea/
 .gradle/
+.kotlin/
 node_modules/
+.vscode/
 
 jadx-output/
 *-tmp/
 **/tmp/
 *.jobf
+*.jadx
 
 *.class
+*.jar
 *.dump
 *.log
 *.cfg
 *.orig
 quark.json
 
-cliff.toml
+cliff.toml
+jadx-gui/src/main/resources/logback.xml

.gitlab-ci.yml

@@ -8,17 +8,7 @@ before_script:
 stages:
   - test
 
-java-8:
+build-test:
   stage: test
-  image: openjdk:8
-  script: ./gradlew clean build dist copyExe --warning-mode=all
-
-java-11:
-  stage: test
-  image: openjdk:11
-  script: ./gradlew clean build dist copyExe --warning-mode=all
-
-java-latest:
-  stage: test
-  image: openjdk:latest
-  script: java -version && ./gradlew clean build dist --warning-mode=all
+  image: eclipse-temurin:21
+  script: JADX_BUILD_JAVA_VERSION=11 JADX_TEST_JAVA_VERSION=11 ./gradlew clean build dist distWin

.jitpack.yml

@@ -0,0 +1,5 @@
+jdk:
+  - openjdk11
+install:
+  - echo "Jitpack is not supported. Use artifacts from Maven Central (https://search.maven.org/search?q=jadx), check usage help at https://github.com/skylot/jadx/wiki/Use-jadx-as-a-library"
+  - ./gradlew intentional-fail

.run/jadx-gui.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+	<configuration default="false" name="jadx-gui" type="Application" factoryName="Application">
+		<option name="MAIN_CLASS_NAME" value="jadx.gui.JadxGUI"/>
+		<module name="jadx.jadx-gui.main"/>
+		<option name="PROGRAM_PARAMETERS" value="-v"/>
+		<option name="VM_PARAMETERS"
+				value="-Xms128M -XX:MaxRAMPercentage=70.0 -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Djava.util.Arrays.useLegacyMergeSort=true -Djdk.util.zip.disableZip64ExtraFieldValidation=true -XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.lang=ALL-UNNAMED --enable-native-access=ALL-UNNAMED -Dsun.java2d.noddraw=true -Dsun.java2d.d3d=false -Dsun.java2d.ddforcevram=true -Dsun.java2d.ddblit=false -Dswing.useflipBufferStrategy=true"/>
+		<method v="2">
+			<option name="Make" enabled="true"/>
+		</method>
+	</configuration>
+</component>

.typos.toml

@@ -0,0 +1,20 @@
+# Config for 'typos' spellchecker (https://github.com/crate-ci/typos)
+
+[default.extend-words]
+IPUT = "IPUT"
+Laf = "Laf"
+Darcula="Darcula"
+
+[default]
+extend-ignore-identifiers-re = [
+    "finaly", # intentional package name
+]
+
+[files]
+extend-exclude = [
+    "config/",
+    "jadx-core/src/main/resources/",
+    "jadx-core/src/test/",
+    "jadx-gui/src/main/resources/i18n/",
+    "!jadx-gui/src/main/resources/i18n/Messages_en_US.properties",
+]

CODE_OF_CONDUCT.md

@@ -3,7 +3,7 @@
 ## Our Pledge
 
 In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
+contributors and maintainers pledge to make participation in our project and
 our community a harassment-free experience for everyone, regardless of age, body
 size, disability, ethnicity, sex characteristics, gender identity and expression,
 level of experience, education, socio-economic status, nationality, personal
@@ -23,13 +23,13 @@ include:
 Examples of unacceptable behavior by participants include:
 
 * The use of sexualized language or imagery and unwelcome sexual attention or
- advances
+  advances
 * Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
 * Publishing others' private information, such as a physical or electronic
- address, without explicit permission
+  address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
- professional setting
+  professional setting
 
 ## Our Responsibilities
 
@@ -45,25 +45,12 @@ threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at skylot@gmail.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
+This Code of Conduct applies within all project spaces, and it also applies when
+an individual is representing the project or its community in public spaces.
+Examples of representing a project or community include using an official
+project e-mail address, posting via an official social media account, or acting
+as an appointed representative at an online or offline event. Representation of
+a project may be further defined and clarified by project maintainers.
 
 ## Attribution
 

CONTRIBUTING.md

@@ -1,32 +1,27 @@
 # Contributing
 
-Please note we have a [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
+Please note, we have [code of conduct](CODE_OF_CONDUCT.md), please follow it in all your interactions with the project.
 
 ## Open Issue
 
-1. Before proceed please do:
+1. Before proceed, please do:
     - check [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A) section on wiki
     - search existing issues by exception message
 
-2. Describe error
-    **Describe error**
+2. Describe error:
     - full name of method or class with error
     - full java stacktrace (no need to copy method fallback code (commented pseudocode))
     - **IMPORTANT!:** attach or provide link to apk file (double check apk version)
 
-      **Note**: GitHub don't allow attach files with `.apk` extension, but you can change extension by adding `.zip` at the end :)
+	  **Note**: GitHub don't allow attaching files with `.apk` extension, but you can change extension by adding `.zip` at the end :)
 
 
 ## Pull Request Process
 
-1. Please don't submit any code style fixes, dependencies updates or other changes which are not fixing any issues.
+1. Please don't submit any code style fixes or dependencies updates changes.
 
-1. Before start working on PR please discuss the change you wish to make via issue. PR without corresponding issue will be rejected.
-
-1. Use only features and API from Java 8 or below.
-
-1. If possible don't add additional dependencies especially if they are big.
+1. Use only features and API from Java 11 or below.
 
 1. Make sure your code is correctly formatted, see description here: [Code Formatting](https://github.com/skylot/jadx/wiki/Code-Formatting).
 
-1. Make sure your changes is passing build: `./gradlew clean build dist`
+1. Make sure your changes are passing build: `./gradlew clean build dist`

README.md

@@ -2,20 +2,25 @@
 
 ## JADX
 
-[![Build status](https://github.com/skylot/jadx/workflows/Build/badge.svg)](https://github.com/skylot/jadx/actions?query=workflow%3ABuild)
-[![Alerts from lgtm.com](https://img.shields.io/lgtm/alerts/g/skylot/jadx.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/skylot/jadx/alerts/)
-[![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
+![Build status](https://img.shields.io/github/actions/workflow/status/skylot/jadx/build-artifacts.yml)
+![GitHub contributors](https://img.shields.io/github/contributors/skylot/jadx)
+![GitHub all releases](https://img.shields.io/github/downloads/skylot/jadx/total)
+![GitHub release (latest by SemVer)](https://img.shields.io/github/downloads/skylot/jadx/latest/total)
+![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)
 [![Maven Central](https://img.shields.io/maven-central/v/io.github.skylot/jadx-core)](https://search.maven.org/search?q=g:io.github.skylot%20AND%20jadx)
+![Java 11+](https://img.shields.io/badge/Java-11%2B-blue)
 [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html)
 
 **jadx** - Dex to Java decompiler
 
 Command line and GUI tools for producing Java source code from Android Dex and Apk files
 
-:exclamation::exclamation::exclamation: Please note that in most cases **jadx** can't decompile all 100% of the code, so errors will occur. Check [Troubleshooting guide](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A#decompilation-issues) for workarounds
+> [!WARNING]
+> Please note that in most cases **jadx** can't decompile all 100% of the code, so errors will occur.<br />
+> Check [Troubleshooting guide](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A#decompilation-issues) for workarounds.
 
 **Main features:**
-- decompile Dalvik bytecode to java classes from APK, dex, aar, aab and zip files
+- decompile Dalvik bytecode to Java code from APK, dex, aar, aab and zip files
 - decode `AndroidManifest.xml` and other resources from `resources.arsc`
 - deobfuscator included
 
@@ -33,8 +38,9 @@ See these features in action here: [jadx-gui features overview](https://github.c
 <img src="https://user-images.githubusercontent.com/118523/142730720-839f017e-38db-423e-b53f-39f5f0a0316f.png" width="700"/>
 
 ### Download
-- release from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest)
-- latest [unstable build](https://nightly.link/skylot/jadx/workflows/build/master)
+- release
+  from [github: ![Latest release](https://img.shields.io/github/release/skylot/jadx.svg)](https://github.com/skylot/jadx/releases/latest)
+- latest [unstable build ![GitHub commits since tagged version (branch)](https://img.shields.io/github/commits-since/skylot/jadx/latest/master)](https://nightly.link/skylot/jadx/workflows/build-artifacts/master)
 
 After download unpack zip file go to `bin` directory and run:
 - `jadx` - command line version
@@ -45,20 +51,28 @@ On Windows run `.bat` files with double-click\
 For Windows, you can download it from [oracle.com](https://www.oracle.com/java/technologies/downloads/#jdk17-windows) (select x64 Installer).
 
 ### Install
-1. Arch linux
-    ```bash
-        sudo pacman -S jadx
-    ```
-2. macOS
-    ```bash
-        brew install jadx
-    ```
+- Arch Linux
+  [![Arch Linux package](https://img.shields.io/archlinux/v/extra/any/jadx)](https://archlinux.org/packages/extra/any/jadx/)
+  [![AUR Version](https://img.shields.io/aur/version/jadx-git)](https://aur.archlinux.org/packages/jadx-git)
+  ```bash
+  sudo pacman -S jadx
+  ```
+- macOS
+  [![homebrew version](https://img.shields.io/homebrew/v/jadx)](https://formulae.brew.sh/formula/jadx)
+  ```bash
+  brew install jadx
+  ```
+- Flathub
+  [![Flathub Version](https://img.shields.io/flathub/v/com.github.skylot.jadx)](https://flathub.org/apps/com.github.skylot.jadx)
+  ```bash
+  flatpak install flathub com.github.skylot.jadx
+  ```
 
 ### Use jadx as a library
 You can use jadx in your java projects, check details on [wiki page](https://github.com/skylot/jadx/wiki/Use-jadx-as-a-library)
 
 ### Build from source
-JDK 8 or higher must be installed:
+JDK 11 or higher must be installed:
 ```
 git clone https://github.com/skylot/jadx.git
 cd jadx
@@ -72,64 +86,161 @@ and also packed to `build/jadx-<version>.zip`
 
 ### Usage
 ```
-jadx[-gui] [options] <input files> (.apk, .dex, .jar, .class, .smali, .zip, .aar, .arsc, .aab)
+jadx[-gui] [command] [options] <input files> (.apk, .dex, .jar, .class, .smali, .zip, .aar, .arsc, .aab, .xapk, .apkm, .jadx.kts)
+commands (use '<command> --help' for command options):
+  plugins	  - manage jadx plugins
+
 options:
-  -d, --output-dir                    - output directory
-  -ds, --output-dir-src               - output directory for sources
-  -dr, --output-dir-res               - output directory for resources
-  -r, --no-res                        - do not decode resources
-  -s, --no-src                        - do not decompile source code
-  --single-class                      - decompile a single class, full name, raw or alias
-  --single-class-output               - file or dir for write if decompile a single class
-  --output-format                     - can be 'java' or 'json', default: java
-  -e, --export-gradle                 - save as android gradle project
-  -j, --threads-count                 - processing threads count, default: 4
-  --show-bad-code                     - show inconsistent code (incorrectly decompiled)
-  --no-imports                        - disable use of imports, always write entire package name
-  --no-debug-info                     - disable debug info
-  --add-debug-lines                   - add comments with debug line numbers if available
-  --no-inline-anonymous               - disable anonymous classes inline
-  --no-inline-methods                 - disable methods inline
-  --no-replace-consts                 - don't replace constant value with matching constant field
-  --escape-unicode                    - escape non latin characters in strings (with \u)
-  --respect-bytecode-access-modifiers - don't change original access modifiers
-  --deobf                             - activate deobfuscation
-  --deobf-min                         - min length of name, renamed if shorter, default: 3
-  --deobf-max                         - max length of name, renamed if longer, default: 64
-  --deobf-cfg-file                    - deobfuscation map file, default: same dir and name as input file with '.jobf' extension
-  --deobf-cfg-file-mode               - set mode for handle deobfuscation map file:
-                                         'read' - read if found, don't save (default)
-                                         'read-or-save' - read if found, save otherwise (don't overwrite)
-                                         'overwrite' - don't read, always save
-                                         'ignore' - don't read and don't save
-  --deobf-rewrite-cfg                 - set '--deobf-cfg-file-mode' to 'overwrite' (deprecated)
-  --deobf-use-sourcename              - use source file name as class name alias
-  --deobf-parse-kotlin-metadata       - parse kotlin metadata to class and package names
-  --use-kotlin-methods-for-var-names  - use kotlin intrinsic methods to rename variables, values: disable, apply, apply-and-hide, default: apply
-  --rename-flags                      - fix options (comma-separated list of):
-                                         'case' - fix case sensitivity issues (according to --fs-case-sensitive option),
-                                         'valid' - rename java identifiers to make them valid,
-                                         'printable' - remove non-printable chars from identifiers,
-                                        or single 'none' - to disable all renames
-                                        or single 'all' - to enable all (default)
-  --fs-case-sensitive                 - treat filesystem as case sensitive, false by default
-  --cfg                               - save methods control flow graph to dot file
-  --raw-cfg                           - save methods control flow graph (use raw instructions)
-  -f, --fallback                      - make simple dump (using goto instead of 'if', 'for', etc)
-  --use-dx                            - use dx/d8 to convert java bytecode
-  --comments-level                    - set code comments level, values: error, warn, info, debug, user-only, none, default: info
-  --log-level                         - set log level, values: quiet, progress, error, warn, info, debug, default: progress
-  -v, --verbose                       - verbose output (set --log-level to DEBUG)
-  -q, --quiet                         - turn off output (set --log-level to QUIET)
-  --version                           - print jadx version
-  -h, --help                          - print this help
+  -d, --output-dir                              - output directory
+  -ds, --output-dir-src                         - output directory for sources
+  -dr, --output-dir-res                         - output directory for resources
+  -r, --no-res                                  - do not decode resources
+  -s, --no-src                                  - do not decompile source code
+  -j, --threads-count                           - processing threads count, default: 16
+  --single-class                                - decompile a single class, full name, raw or alias
+  --single-class-output                         - file or dir for write if decompile a single class
+  --output-format                               - can be 'java' or 'json', default: java
+  -e, --export-gradle                           - save as gradle project (set '--export-gradle-type' to 'auto')
+  --export-gradle-type                          - Gradle project template for export:
+                                                   'auto' - detect automatically
+                                                   'android-app' - Android Application (apk)
+                                                   'android-library' - Android Library (aar)
+                                                   'simple-java' - simple Java
+  -m, --decompilation-mode                      - code output mode:
+                                                   'auto' - trying best options (default)
+                                                   'restructure' - restore code structure (normal java code)
+                                                   'simple' - simplified instructions (linear, with goto's)
+                                                   'fallback' - raw instructions without modifications
+  --show-bad-code                               - show inconsistent code (incorrectly decompiled)
+  --no-xml-pretty-print                         - do not prettify XML
+  --no-imports                                  - disable use of imports, always write entire package name
+  --no-debug-info                               - disable debug info parsing and processing
+  --add-debug-lines                             - add comments with debug line numbers if available
+  --no-inline-anonymous                         - disable anonymous classes inline
+  --no-inline-methods                           - disable methods inline
+  --no-move-inner-classes                       - disable move inner classes into parent
+  --no-inline-kotlin-lambda                     - disable inline for Kotlin lambdas
+  --no-finally                                  - don't extract finally block
+  --no-restore-switch-over-string               - don't restore switch over string
+  --no-replace-consts                           - don't replace constant value with matching constant field
+  --escape-unicode                              - escape non latin characters in strings (with \u)
+  --respect-bytecode-access-modifiers           - don't change original access modifiers
+  --mappings-path                               - deobfuscation mappings file or directory. Allowed formats: Tiny and Tiny v2 (both '.tiny'), Enigma (.mapping) or Enigma directory
+  --mappings-mode                               - set mode for handling the deobfuscation mapping file:
+                                                   'read' - just read, user can always save manually (default)
+                                                   'read-and-autosave-every-change' - read and autosave after every change
+                                                   'read-and-autosave-before-closing' - read and autosave before exiting the app or closing the project
+                                                   'ignore' - don't read or save (can be used to skip loading mapping files referenced in the project file)
+  --deobf                                       - activate deobfuscation
+  --deobf-min                                   - min length of name, renamed if shorter, default: 3
+  --deobf-max                                   - max length of name, renamed if longer, default: 64
+  --deobf-whitelist                             - space separated list of classes (full name) and packages (ends with '.*') to exclude from deobfuscation, default: android.support.v4.* android.support.v7.* android.support.v4.os.* android.support.annotation.Px androidx.core.os.* androidx.annotation.Px
+  --deobf-cfg-file                              - deobfuscation mappings file used for JADX auto-generated names (in the JOBF file format), default: same dir and name as input file with '.jobf' extension
+  --deobf-cfg-file-mode                         - set mode for handling the JADX auto-generated names' deobfuscation map file:
+                                                   'read' - read if found, don't save (default)
+                                                   'read-or-save' - read if found, save otherwise (don't overwrite)
+                                                   'overwrite' - don't read, always save
+                                                   'ignore' - don't read and don't save
+  --deobf-res-name-source                       - better name source for resources:
+                                                   'auto' - automatically select best name (default)
+                                                   'resources' - use resources names
+                                                   'code' - use R class fields names
+  --use-source-name-as-class-name-alias         - use source name as class name alias:
+                                                   'always' - always use source name if it's available
+                                                   'if-better' - use source name if it seems better than the current one
+                                                   'never' - never use source name, even if it's available
+  --source-name-repeat-limit                    - allow using source name if it appears less than a limit number, default: 10
+  --use-kotlin-methods-for-var-names            - use kotlin intrinsic methods to rename variables, values: disable, apply, apply-and-hide, default: apply
+  --use-headers-for-detect-resource-extensions  - Use headers for detect resource extensions if resource obfuscated
+  --rename-flags                                - fix options (comma-separated list of):
+                                                   'case' - fix case sensitivity issues (according to --fs-case-sensitive option),
+                                                   'valid' - rename java identifiers to make them valid,
+                                                   'printable' - remove non-printable chars from identifiers,
+                                                  or single 'none' - to disable all renames
+                                                  or single 'all' - to enable all (default)
+  --integer-format                              - how integers are displayed:
+                                                   'auto' - automatically select (default)
+                                                   'decimal' - use decimal
+                                                   'hexadecimal' - use hexadecimal
+  --type-update-limit                           - type update limit count (per one instruction), default: 10
+  --fs-case-sensitive                           - treat filesystem as case sensitive, false by default
+  --cfg                                         - save methods control flow graph to dot file
+  --raw-cfg                                     - save methods control flow graph (use raw instructions)
+  -f, --fallback                                - set '--decompilation-mode' to 'fallback' (deprecated)
+  --use-dx                                      - use dx/d8 to convert java bytecode
+  --comments-level                              - set code comments level, values: error, warn, info, debug, user-only, none, default: info
+  --log-level                                   - set log level, values: quiet, progress, error, warn, info, debug, default: progress
+  -v, --verbose                                 - verbose output (set --log-level to DEBUG)
+  -q, --quiet                                   - turn off output (set --log-level to QUIET)
+  --disable-plugins                             - comma separated list of plugin ids to disable
+  --config <config-ref>                         - load configuration from file, <config-ref> can be:
+                                                   path to '.json' file
+                                                   short name - uses file with this name from config directory
+                                                   'none' - to disable config loading
+  --save-config <config-ref>                    - save current options into configuration file and exit, <config-ref> can be:
+                                                   empty - for default config
+                                                   path to '.json' file
+                                                   short name - file will be saved in config directory
+  --print-files                                 - print files and directories used by jadx (config, cache, temp)
+  --version                                     - print jadx version
+  -h, --help                                    - print this help
+
+Plugin options (-P<name>=<value>):
+  dex-input: Load .dex and .apk files
+    - dex-input.verify-checksum                 - verify dex file checksum before load, values: [yes, no], default: yes
+  java-convert: Convert .class, .jar and .aar files to dex
+    - java-convert.mode                         - convert mode, values: [dx, d8, both], default: both
+    - java-convert.d8-desugar                   - use desugar in d8, values: [yes, no], default: no
+  kotlin-metadata: Use kotlin.Metadata annotation for code generation
+    - kotlin-metadata.class-alias               - rename class alias, values: [yes, no], default: yes
+    - kotlin-metadata.method-args               - rename function arguments, values: [yes, no], default: yes
+    - kotlin-metadata.fields                    - rename fields, values: [yes, no], default: yes
+    - kotlin-metadata.companion                 - rename companion object, values: [yes, no], default: yes
+    - kotlin-metadata.data-class                - add data class modifier, values: [yes, no], default: yes
+    - kotlin-metadata.to-string                 - rename fields using toString, values: [yes, no], default: yes
+    - kotlin-metadata.getters                   - rename simple getters to field names, values: [yes, no], default: yes
+  kotlin-smap: Use kotlin.SourceDebugExtension annotation for rename class alias
+    - kotlin-smap.class-alias-source-dbg        - rename class alias from SourceDebugExtension, values: [yes, no], default: no
+  rename-mappings: various mappings support
+    - rename-mappings.format                    - mapping format, values: [AUTO, TINY_FILE, TINY_2_FILE, ENIGMA_FILE, ENIGMA_DIR, PROGUARD_FILE, SRG_FILE, XSRG_FILE, JAM_FILE, CSRG_FILE, TSRG_FILE, TSRG_2_FILE, INTELLIJ_MIGRATION_MAP_FILE, RECAF_SIMPLE_FILE, JOBF_FILE], default: AUTO
+    - rename-mappings.invert                    - invert mapping on load, values: [yes, no], default: no
+  smali-input: Load .smali files
+    - smali-input.api-level                     - Android API level, default: 27
+
+Environment variables:
+  JADX_DISABLE_XML_SECURITY - set to 'true' to disable all security checks for XML files
+  JADX_DISABLE_ZIP_SECURITY - set to 'true' to disable all security checks for zip files
+  JADX_ZIP_MAX_ENTRIES_COUNT - maximum allowed number of entries in zip files (default: 100 000)
+  JADX_CONFIG_DIR - custom config directory, using system by default
+  JADX_CACHE_DIR - custom cache directory, using system by default
+  JADX_TMP_DIR - custom temp directory, using system by default
+
 Examples:
   jadx -d out classes.dex
   jadx --rename-flags "none" classes.dex
   jadx --rename-flags "valid, printable" classes.dex
   jadx --log-level ERROR app.apk
+  jadx -Pdex-input.verify-checksum=no app.apk
 ```
-These options also worked on jadx-gui running from command line and override options from preferences dialog
+These options also work in jadx-gui running from command line and override options from preferences' dialog
+
+Usage for `plugins` command
+```
+usage: plugins [options]
+options:
+  -i, --install <locationId>      - install plugin with locationId
+  -j, --install-jar <path-to.jar> - install plugin from jar file
+  -l, --list                      - list installed plugins
+  -a, --available                 - list available plugins from jadx-plugins-list (aka marketplace)
+  -u, --update                    - update installed plugins
+  --uninstall <pluginId>          - uninstall plugin with pluginId
+  --disable <pluginId>            - disable plugin with pluginId
+  --enable <pluginId>             - enable plugin with pluginId
+  --list-all                      - list all plugins including bundled and dropins
+  --list-versions <locationId>    - fetch latest versions of plugin from locationId (will download all artefacts, limited to 10)
+  -h, --help                      - print this help
+```
+
 
 ### Troubleshooting
 Please check wiki page [Troubleshooting Q&A](https://github.com/skylot/jadx/wiki/Troubleshooting-Q&A)

SECURITY.md

@@ -2,6 +2,7 @@
 
 ## Reporting a Vulnerability
 
-To report a security issue, please email `skylot@gmail.com` with a description of the issue, the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
-We will check and respond within 3 working days. If the issue is confirmed as a vulnerability, we will apply required mitigations at the next release.
-This project follows a 90 day disclosure timeline.
+To report a security issue, please open a [new security advisory](https://github.com/skylot/jadx/security/advisories/new).
+Please fill the steps you took to create the issue, affected versions, and, if known, mitigations for the issue.
+We will check and respond within 3 working days.
+If the issue is confirmed as a vulnerability, we will apply required mitigations at the next release.

build.gradle

@@ -1,162 +0,0 @@
-plugins {
-	id 'com.github.ben-manes.versions' version '0.42.0'
-	id 'com.diffplug.spotless' version '6.2.2'
-}
-
-ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
-version = jadxVersion
-println("jadx version: ${jadxVersion}")
-
-allprojects {
-	apply plugin: 'java'
-	apply plugin: 'checkstyle'
-
-	version = jadxVersion
-
-	sourceCompatibility = JavaVersion.VERSION_1_8
-	targetCompatibility = JavaVersion.VERSION_1_8
-
-	compileJava {
-		options.encoding = "UTF-8"
-	}
-
-	jar {
-		manifest {
-			mainAttributes('jadx-version': jadxVersion)
-		}
-	}
-
-	dependencies {
-		implementation 'org.slf4j:slf4j-api:1.7.36'
-		compileOnly 'org.jetbrains:annotations:23.0.0'
-
-		testImplementation 'ch.qos.logback:logback-classic:1.2.10'
-		testImplementation 'org.hamcrest:hamcrest-library:2.2'
-		testImplementation 'org.mockito:mockito-core:4.3.1'
-		testImplementation 'org.assertj:assertj-core:3.22.0'
-
-		testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-		testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
-
-		testImplementation 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
-		testCompileOnly 'org.jetbrains:annotations:23.0.0'
-	}
-
-	test {
-		useJUnitPlatform()
-	}
-
-	repositories {
-		mavenLocal()
-		mavenCentral()
-		google()
-	}
-}
-
-spotless {
-	java {
-		target fileTree(rootDir).matching {
-			include 'jadx-cli/src/**/java/**/*.java'
-			include 'jadx-core/src/**/java/**/*.java'
-			include 'jadx-gui/src/**/java/**/*.java'
-			include 'jadx-plugins/**/java/**/*.java'
-		}
-
-		importOrderFile 'config/code-formatter/eclipse.importorder'
-		eclipse().configFile 'config/code-formatter/eclipse.xml'
-		if (JavaVersion.current() < JavaVersion.VERSION_16) {
-			removeUnusedImports()
-		} else {
-			// google-format on Java 16+ issue: https://github.com/diffplug/spotless/issues/834
-			println('Warning! Unused imports remove is disabled for Java 16+'
-					+ ' (use workaround from https://github.com/diffplug/spotless/tree/main/plugin-gradle#google-java-format)')
-		}
-
-		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
-		encoding("UTF-8")
-		trimTrailingWhitespace()
-		endWithNewline()
-	}
-	format 'misc', {
-		target '**/*.gradle', '**/*.md', '**/*.xml', '**/.gitignore', '**/.properties'
-		targetExclude ".gradle/**", ".idea/**", "*/build/**"
-
-		lineEndings(com.diffplug.spotless.LineEnding.UNIX)
-		encoding("UTF-8")
-		trimTrailingWhitespace()
-		endWithNewline()
-	}
-}
-
-dependencyUpdates {
-	resolutionStrategy {
-		componentSelection { rules ->
-			rules.all { ComponentSelection selection ->
-				boolean rejected = ['alpha', 'beta', 'rc', 'cr', 'm', 'atlassian'].any { qualifier ->
-					selection.candidate.version ==~ /(?i).*[.-]${qualifier}[.\d-]*/
-				}
-				if (rejected) {
-					selection.reject('Release candidate')
-				}
-			}
-		}
-	}
-}
-
-task copyArtifacts(type: Copy) {
-	from tasks.getByPath(":jadx-cli:installDist")
-	from tasks.getByPath(":jadx-gui:installDist")
-	into layout.buildDirectory.dir("jadx")
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-task pack(type: Zip) {
-	from copyArtifacts
-	archiveFileName = "jadx-${jadxVersion}.zip"
-	destinationDirectory = layout.buildDirectory
-}
-
-task copyExe(type: Copy) {
-	group 'jadx'
-	description = 'Copy exe to build dir'
-	mustRunAfter pack // not needed, but gradle throws warning because of same output dir
-
-	from tasks.getByPath('jadx-gui:createExe')
-	include '*.exe'
-	into layout.buildDirectory
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-task distWinBundle(type: Copy, dependsOn: 'jadx-gui:distWinWithJre') {
-	group 'jadx'
-	description = 'Copy bundle to build dir'
-	destinationDir buildDir
-	from(tasks.getByPath('jadx-gui:distWinWithJre').outputs) {
-		include '*.zip'
-	}
-	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-}
-
-task dist {
-	group 'jadx'
-	description = 'Build jadx distribution zip'
-
-	dependsOn(pack)
-
-	OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
-	if (os.isWindows()) {
-		if (project.hasProperty("bundleJRE")) {
-			println("Build win bundle with JRE")
-			dependsOn('distWinBundle')
-		} else {
-			dependsOn('copyExe')
-		}
-	}
-}
-
-task cleanBuildDir(type: Delete) {
-	group 'jadx'
-	delete buildDir
-}
-
-clean.dependsOn(cleanBuildDir)

build.gradle.kts

@@ -0,0 +1,170 @@
+import com.diffplug.gradle.spotless.FormatExtension
+import com.diffplug.gradle.spotless.SpotlessExtension
+import com.diffplug.spotless.LineEnding
+import com.github.benmanes.gradle.versions.updates.DependencyUpdatesTask
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+import java.util.Locale
+
+plugins {
+	id("com.github.ben-manes.versions") version "0.53.0"
+	id("se.patrikerdes.use-latest-versions") version "0.2.19"
+	id("com.diffplug.spotless") version "6.25.0"
+}
+
+val jadxVersion by extra { System.getenv("JADX_VERSION") ?: "dev" }
+println("jadx version: $jadxVersion")
+version = jadxVersion
+
+val jadxBuildJavaVersion by extra { getBuildJavaVersion() }
+
+fun getBuildJavaVersion(): Int? {
+	val envVarName = "JADX_BUILD_JAVA_VERSION"
+	val buildJavaVer = System.getenv(envVarName)?.toInt() ?: return null
+	if (buildJavaVer < 11) {
+		throw GradleException("'$envVarName' can't be set to lower than 11")
+	}
+	println("Set Java toolchain for jadx build to version '$buildJavaVer'")
+	return buildJavaVer
+}
+
+allprojects {
+	apply(plugin = "java")
+	apply(plugin = "checkstyle")
+	apply(plugin = "com.diffplug.spotless")
+	apply(plugin = "com.github.ben-manes.versions")
+	apply(plugin = "se.patrikerdes.use-latest-versions")
+
+	repositories {
+		mavenCentral()
+	}
+
+	configure<SpotlessExtension> {
+		java {
+			importOrderFile("$rootDir/config/code-formatter/eclipse.importorder")
+			eclipse().configFile("$rootDir/config/code-formatter/eclipse.xml")
+			removeUnusedImports()
+			commonFormatOptions()
+		}
+		kotlin {
+			ktlint().editorConfigOverride(mapOf("indent_style" to "tab"))
+			commonFormatOptions()
+		}
+		kotlinGradle {
+			ktlint()
+			commonFormatOptions()
+		}
+		format("misc") {
+			target("**/*.gradle", "**/*.xml", "**/.gitignore", "**/.properties")
+			targetExclude(".gradle/**", ".idea/**", "*/build/**")
+			commonFormatOptions()
+		}
+	}
+
+	tasks.named<DependencyUpdatesTask>("dependencyUpdates") {
+		rejectVersionIf {
+			// disallow release candidates as upgradable versions from stable versions
+			isNonStable(candidate.version) && !isNonStable(currentVersion)
+		}
+	}
+}
+
+fun FormatExtension.commonFormatOptions() {
+	lineEndings = LineEnding.UNIX
+	encoding = Charsets.UTF_8
+	trimTrailingWhitespace()
+	endWithNewline()
+}
+
+fun isNonStable(version: String): Boolean {
+	val stableKeyword = listOf("RELEASE", "FINAL", "GA").any { version.uppercase(Locale.getDefault()).contains(it) }
+	val regex = "^[0-9,.v-]+(-r)?$".toRegex()
+	val isStable = stableKeyword || regex.matches(version)
+	return isStable.not()
+}
+
+val distWinConfiguration: Configuration by configurations.creating {
+	isCanBeConsumed = false
+}
+val distWinWithJreConfiguration: Configuration by configurations.creating {
+	isCanBeConsumed = false
+}
+dependencies {
+	distWinConfiguration(project(":jadx-gui", "distWinConfiguration"))
+	distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration"))
+}
+
+val copyArtifacts by tasks.registering(Copy::class) {
+	val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern()
+	from(tasks.getByPath(":jadx-cli:installShadowDist")) {
+		exclude("**/*.jar")
+		filter { line ->
+			jarCliPattern.matcher(line).replaceAll("jadx-$1-all.jar")
+				.replace("-jar \"\\\"\$CLASSPATH\\\"\"", "-cp \"\\\"\$CLASSPATH\\\"\" jadx.cli.JadxCLI")
+				.replace("-jar \"%CLASSPATH%\"", "-cp \"%CLASSPATH%\" jadx.cli.JadxCLI")
+		}
+	}
+	val jarGuiPattern = "jadx-gui-(.*)-all.jar".toPattern()
+	from(tasks.getByPath(":jadx-gui:installShadowDist")) {
+		exclude("**/*.jar")
+		filter { line -> jarGuiPattern.matcher(line).replaceAll("jadx-$1-all.jar") }
+	}
+	from(tasks.getByPath(":jadx-gui:installShadowDist")) {
+		include("**/*.jar")
+		rename("jadx-gui-(.*)-all.jar", "jadx-$1-all.jar")
+	}
+	from(layout.projectDirectory) {
+		include("README.md")
+		include("LICENSE")
+	}
+	into(layout.buildDirectory.dir("jadx"))
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+val pack by tasks.registering(Zip::class) {
+	from(copyArtifacts)
+	archiveFileName.set("jadx-$jadxVersion.zip")
+	destinationDirectory.set(layout.buildDirectory)
+}
+
+val distWin by tasks.registering(Zip::class) {
+	group = "jadx"
+	description = "Build Windows bundle"
+
+	from(distWinConfiguration)
+
+	destinationDirectory.set(layout.buildDirectory.dir("distWin"))
+	archiveFileName.set("jadx-gui-$jadxVersion-win.zip")
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+val distWinWithJre by tasks.registering(Zip::class) {
+	description = "Build Windows with JRE bundle"
+
+	from(distWinWithJreConfiguration)
+
+	destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre"))
+	archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip")
+	duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
+val dist by tasks.registering {
+	group = "jadx"
+	description = "Build jadx distribution zip bundles"
+
+	dependsOn(pack)
+
+	val os = DefaultNativePlatform.getCurrentOperatingSystem()
+	if (os.isWindows) {
+		if (project.hasProperty("bundleJRE")) {
+			println("Build win bundle with JRE")
+			dependsOn(distWinWithJre)
+		} else {
+			dependsOn(distWin)
+		}
+	}
+}
+
+val cleanBuildDir by tasks.registering(Delete::class) {
+	delete(layout.buildDirectory)
+}
+tasks.getByName("clean").dependsOn(cleanBuildDir)

buildSrc/build.gradle

@@ -1,3 +0,0 @@
-plugins {
-	id 'groovy-gradle-plugin'
-}

buildSrc/build.gradle.kts

@@ -0,0 +1,13 @@
+plugins {
+	`kotlin-dsl`
+}
+
+dependencies {
+	implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10")
+
+	implementation("org.openrewrite:plugin:6.19.1")
+}
+
+repositories {
+	gradlePluginPortal()
+}

buildSrc/src/main/groovy/jadx-library.gradle

@@ -1,78 +0,0 @@
-plugins {
-	id 'java-library'
-	id 'maven-publish'
-	id 'signing'
-}
-
-
-group = 'io.github.skylot'
-version = jadxVersion
-
-java {
-	withJavadocJar()
-	withSourcesJar()
-}
-
-publishing {
-	publications {
-		mavenJava(MavenPublication) {
-			artifactId = project.name
-			from components.java
-			versionMapping {
-				usage('java-api') {
-					fromResolutionOf('runtimeClasspath')
-				}
-				usage('java-runtime') {
-					fromResolutionResult()
-				}
-			}
-			pom {
-				name = project.name
-				description = 'Dex to Java decompiler'
-				url = 'https://github.com/skylot/jadx'
-				licenses {
-					license {
-						name = 'The Apache License, Version 2.0'
-						url = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-					}
-				}
-				developers {
-					developer {
-						id = 'skylot'
-						name = 'Skylot'
-						email = 'skylot@gmail.com'
-						url = 'https://github.com/skylot'
-					}
-				}
-				scm {
-					connection = 'scm:git:git://github.com/skylot/jadx.git'
-					developerConnection = 'scm:git:ssh://github.com:skylot/jadx.git'
-					url = 'https://github.com/skylot/jadx'
-				}
-			}
-		}
-	}
-	repositories {
-		maven {
-			def releasesRepoUrl = uri('https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/')
-			def snapshotsRepoUrl = uri('https://s01.oss.sonatype.org/content/repositories/snapshots/')
-			url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
-			credentials {
-				username = project.properties['ossrhUser'].toString()
-				password = project.properties['ossrhPassword'].toString()
-			}
-		}
-	}
-}
-
-signing {
-	sign publishing.publications.mavenJava
-}
-
-javadoc {
-	if (JavaVersion.current().isJava9Compatible()) {
-		options.addBooleanOption('html5', true)
-	}
-	// disable 'missing' warnings
-	options.addStringOption('Xdoclint:all,-missing', '-quiet')
-}

buildSrc/src/main/kotlin/jadx-java.gradle.kts

@@ -0,0 +1,64 @@
+import org.gradle.api.tasks.testing.logging.TestExceptionFormat
+
+plugins {
+	java
+	checkstyle
+
+	id("jadx-rewrite")
+}
+
+val jadxVersion: String by rootProject.extra
+val jadxBuildJavaVersion: Int? by rootProject.extra
+
+group = "io.github.skylot"
+version = jadxVersion
+
+dependencies {
+	implementation("org.slf4j:slf4j-api:2.0.17")
+	compileOnly("org.jetbrains:annotations:26.0.2")
+
+	testImplementation("ch.qos.logback:logback-classic:1.5.22")
+	testImplementation("org.assertj:assertj-core:3.27.6")
+
+	testImplementation("org.junit.jupiter:junit-jupiter:5.13.3")
+	testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+
+	testCompileOnly("org.jetbrains:annotations:26.0.2")
+}
+
+repositories {
+	mavenCentral()
+	// required for: aapt-proto, r8, smali
+	google()
+}
+
+java {
+	jadxBuildJavaVersion?.let { buildJavaVer ->
+		toolchain {
+			languageVersion = JavaLanguageVersion.of(buildJavaVer)
+		}
+	}
+	sourceCompatibility = JavaVersion.VERSION_11
+	targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks {
+	compileJava {
+		options.encoding = "UTF-8"
+		// options.compilerArgs = listOf("-Xlint:deprecation")
+	}
+	jar {
+		manifest {
+			attributes("jadx-version" to jadxVersion)
+		}
+	}
+	test {
+		useJUnitPlatform()
+		maxParallelForks = Runtime.getRuntime().availableProcessors()
+		testLogging {
+			showExceptions = true
+			exceptionFormat = TestExceptionFormat.FULL
+			showCauses = true
+		}
+	}
+}

buildSrc/src/main/kotlin/jadx-kotlin.gradle.kts

@@ -0,0 +1,17 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+
+plugins {
+	id("jadx-java")
+	id("org.jetbrains.kotlin.jvm")
+}
+
+dependencies {
+	implementation(kotlin("stdlib"))
+	implementation(kotlin("reflect")) // don't work from plugin classloader
+}
+
+kotlin {
+	compilerOptions {
+		jvmTarget.set(JvmTarget.JVM_11)
+	}
+}

buildSrc/src/main/kotlin/jadx-library.gradle.kts

@@ -0,0 +1,81 @@
+plugins {
+	id("jadx-java")
+	id("java-library")
+	id("maven-publish")
+	id("signing")
+}
+
+val jadxVersion: String by rootProject.extra
+
+group = "io.github.skylot"
+version = jadxVersion
+
+java {
+	withJavadocJar()
+	withSourcesJar()
+}
+
+publishing {
+	publications {
+		create<MavenPublication>("mavenJava") {
+			artifactId = project.name
+			from(components["java"])
+			versionMapping {
+				usage("java-api") {
+					fromResolutionOf("runtimeClasspath")
+				}
+				usage("java-runtime") {
+					fromResolutionResult()
+				}
+			}
+			pom {
+				name.set(project.name)
+				description.set(project.description ?: "Dex to Java decompiler")
+				url.set("https://github.com/skylot/jadx")
+				licenses {
+					license {
+						name.set("The Apache License, Version 2.0")
+						url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
+					}
+				}
+				developers {
+					developer {
+						id.set("skylot")
+						name.set("Skylot")
+						email.set(project.properties["libEmail"].toString())
+						url.set("https://github.com/skylot")
+					}
+				}
+				scm {
+					connection.set("scm:git:git://github.com/skylot/jadx.git")
+					developerConnection.set("scm:git:ssh://github.com:skylot/jadx.git")
+					url.set("https://github.com/skylot/jadx")
+				}
+			}
+		}
+	}
+	repositories {
+		maven {
+			val releasesRepoUrl = uri("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/")
+			val snapshotsRepoUrl = uri("https://s01.oss.sonatype.org/content/repositories/snapshots/")
+			url = if (version.toString().endsWith("SNAPSHOT")) snapshotsRepoUrl else releasesRepoUrl
+			credentials {
+				username = project.properties["ossrhUser"].toString()
+				password = project.properties["ossrhPassword"].toString()
+			}
+		}
+	}
+}
+
+signing {
+	isRequired = gradle.taskGraph.hasTask("publish")
+	sign(publishing.publications["mavenJava"])
+}
+
+
+tasks.javadoc {
+	val stdOptions = options as StandardJavadocDocletOptions
+	stdOptions.addBooleanOption("html5", true)
+	// disable 'missing' warnings
+	stdOptions.addStringOption("Xdoclint:all,-missing", "-quiet")
+}

buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts

@@ -0,0 +1,35 @@
+plugins {
+	id("org.openrewrite.rewrite")
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0")
+	rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0")
+	rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0")
+	rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0")
+}
+
+tasks {
+	rewrite {
+		// exclusion("src/test/java/jadx/tests/integration")
+
+		// activeRecipe("org.openrewrite.java.migrate.Java8toJava11")
+
+		// checkstyle auto fix
+		// activeRecipe("org.openrewrite.staticanalysis.CodeCleanup")
+		// setCheckstyleConfigFile(file("$rootDir/config/checkstyle/checkstyle.xml"))
+
+		// logging
+		// activeRecipe("org.openrewrite.java.logging.slf4j.Slf4jBestPractices")
+		// activeRecipe("org.openrewrite.java.logging.slf4j.LoggersNamedForEnclosingClass")
+		// activeRecipe("org.openrewrite.java.logging.slf4j.ParameterizedLogging")
+		// activeRecipe("org.openrewrite.java.logging.PrintStackTraceToLogError")
+
+		// testing
+		activeRecipe("org.openrewrite.java.testing.assertj.Assertj")
+	}
+}

config/checkstyle/checkstyle.xml

@@ -120,15 +120,22 @@
 
 		<module name="SuppressWarningsHolder"/>
 
-		<module name="IllegalType"/>
+		<module name="IllegalType">
+			<property name="illegalClassNames" value="java.util.ArrayList, java.util.HashMap, java.util.HashSet,
+				 java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.TreeMap, java.util.TreeSet"/>
+		</module>
 		<module name="IllegalImport">
 			<property name="illegalClasses" value="jadx.core.utils.DebugUtils"/>
+			<!-- don't use nullable annotations from RxJava -->
+			<property name="illegalClasses" value="io.reactivex.rxjava3.annotations.NonNull"/>
+			<property name="illegalClasses" value="io.reactivex.rxjava3.annotations.Nullable"/>
 		</module>
 		<module name="RegexpSinglelineJava">
 			<property name="id" value="printstacktrace"/>
 			<property name="format" value="\.printStackTrace\(\)"/>
 			<property name="ignoreComments" value="true"/>
-			<property name="message" value="Using Throwable.printStackTrace() is forbidden. Use logger to print exception"/>
+			<property name="message"
+					  value="Using Throwable.printStackTrace() is forbidden. Use logger to print exception"/>
 		</module>
 	</module>
 

config/code-formatter/eclipse.xml

@@ -1,77 +1,248 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="16">
-    <profile kind="CodeFormatterProfile" name="jadx eclipse" version="16">
+<profiles version="23">
+    <profile kind="CodeFormatterProfile" name="jadx eclipse" version="23">
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.align_with_spaces" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
         <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_before_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_switch_case_expressions" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_record_components" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_logical_operator" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_annotation_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_record_declaration" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_abstract_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_switch_case_expressions" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_code_block" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_switch_case_arrow_operator" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="separate_lines_if_wrapped"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_enum_constant" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.text_block_indentation" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_permitted_types" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_annotations" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_assertion_message_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_not_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_package" value="49"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_permitted_types_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_record_header" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_constructor" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_record_components" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_record_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_logical_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_record_declaration" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_end_of_method_body" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_case" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_switch_body_block_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_arrow" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="100"/>
@@ -80,267 +251,148 @@
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_loop_body_block_on_one_line" value="one_line_never"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_enum_constant_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_variable_declarations_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_type_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_additive_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_constructor" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_anonymous_type_declaration_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_shift_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_declaration_on_one_line" value="one_line_never"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_loops" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_for_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_parameter" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_relational_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="separate_lines_if_wrapped"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_additive_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.align_selector_in_method_invocation_on_expression_first_line" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_record_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_switch_case_with_arrow_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_switch_case_with_colon" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_after_code_block" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_if_then_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="48"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_assignment_statements_on_columns" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_type" value="49"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable" value="49"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression_chain" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_arrow_in_switch_default" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_between_different_tags" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_additive_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_field" value="49"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_shift_operator" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
         <setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_code_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_record_components" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_record_declaration" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_switch_case_with_arrow" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_lambda_body_block_on_one_line" value="one_line_never"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_annotations_on_method" value="49"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.keep_record_constructor_on_one_line" value="one_line_never"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_record_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_assertion_message" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_logical_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator" value="true"/>
+        <setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_record_declaration" value="16"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_relational_operator" value="true"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.comment.indent_tag_description" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_string_concatenation" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_last_class_body_declaration" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_simple_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_logical_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_statement_group_in_switch" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_shift_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_do_while_body_on_same_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_permitted_types" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.keep_enum_declaration_on_one_line" value="one_line_never"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
-        <setting id="org.eclipse.jdt.core.formatter.wrap_before_additive_operator" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.keep_simple_getter_setter_on_one_line" value="false"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="false"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
         <setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="false"/>
+        <setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_code_block" value="0"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_after_relational_operator" value="insert"/>
-        <setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.wrap_before_string_concatenation" value="true"/>
-        <setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
         <setting id="org.eclipse.jdt.core.formatter.lineSplit" value="140"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
         <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>

config/jflex/SmaliTokenMaker.flex

@@ -1,7 +1,7 @@
 /*
  * Generated on 11/22/21, 8:58 PM
  */
-package jadx.gui.ui.codeearea;
+package jadx.gui.ui.codearea;
 
 import java.io.*;
 import javax.swing.text.Segment;
@@ -9,7 +9,7 @@ import javax.swing.text.Segment;
 import org.fife.ui.rsyntaxtextarea.*;
 
 
-/**
+/*
  * 用于Smali代码高亮
  * MartinKay@qq.com
  */
@@ -173,7 +173,6 @@ import org.fife.ui.rsyntaxtextarea.*;
 		zzAtEOF  = false;
 	}
 
-
 %}
 
 Letter							= [A-Za-z]
@@ -678,4 +677,3 @@ FLAG_ARRAY = (":array_"{SimpleName})
 	\n						{ addToken(start,zzStartRead-1, Token.COMMENT_EOL); addNullToken(); return firstToken; }
 	<<EOF>>					{ addToken(start,zzStartRead-1, Token.COMMENT_EOL); addNullToken(); return firstToken; }
 }
-

config/jflex/skeleton.default

@@ -57,12 +57,12 @@
   private int yychar;
 
   /**
-   * the number of characters from the last newline up to the start of the 
+   * the number of characters from the last newline up to the start of the
    * matched text
    */
   private int yycolumn;
 
-  /** 
+  /**
    * zzAtBOL == true <=> the scanner is currently at the beginning of a line
    */
   private boolean zzAtBOL = true;
@@ -102,6 +102,9 @@
     zzLexicalState = newState;
   }
 
+  public final int yystate() {
+    return zzLexicalState;
+  }
 
   /**
    * Returns the text matched by the current regular expression.
@@ -112,12 +115,12 @@
 
 
   /**
-   * Returns the character at position <tt>pos</tt> from the 
-   * matched text. 
-   * 
+   * Returns the character at position <tt>pos</tt> from the
+   * matched text.
+   *
    * It is equivalent to yytext().charAt(pos), but faster
    *
-   * @param pos the position of the character to fetch. 
+   * @param pos the position of the character to fetch.
    *            A value from 0 to yylength()-1.
    *
    * @return the character at position pos
@@ -138,8 +141,8 @@
   /**
    * Reports an error that occured while scanning.
    *
-   * In a wellformed scanner (no or only correct usage of 
-   * yypushback(int) and a match-all fallback rule) this method 
+   * In a wellformed scanner (no or only correct usage of
+   * yypushback(int) and a match-all fallback rule) this method
    * will only be called with things that "Can't Possibly Happen".
    * If this method is called, something is seriously wrong
    * (e.g. a JFlex bug producing a faulty scanner etc.).
@@ -159,7 +162,7 @@
     }
 
 --- throws clause
-  } 
+  }
 
 
   /**
@@ -206,12 +209,12 @@
       zzAction = -1;
 
       zzCurrentPosL = zzCurrentPos = zzStartRead = zzMarkedPosL;
-  
+
 --- start admin (lexstate etc)
 
       zzForAction: {
         while (true) {
-    
+
 --- next input, line, col, char count, next transition, isFinal action
             zzAction = zzState;
             zzMarkedPosL = zzCurrentPosL;
@@ -226,11 +229,11 @@
 --- char count update
 
 --- actions
-        default: 
+        default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
             zzAtEOF = true;
 --- eofvalue
-          } 
+          }
           else {
 --- no match
           }

contrib/jadx-gui.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=JADX GUI
+Comment=Dex to Java decompiler
+Icon=jadx
+Exec=jadx-gui %f
+Terminal=false
+Type=Application
+Categories=Development;Java;
+Keywords=Java;Decompiler;
+StartupWMClass=jadx-gui-JadxGUI

gradle.properties

@@ -1 +1,16 @@
 org.gradle.warning.mode=all
+org.gradle.parallel=true
+org.gradle.caching=true
+
+### Disable configuration cache for now: causing issues with spotless and version plugins
+# org.gradle.configuration-cache=true
+# org.gradle.configuration-cache.problems=warn
+
+# Flags for google-java-format (optimize imports by spotless) for Java >= 16.
+# Java < 9 will ignore unsupported flags (thanks to -XX:+IgnoreUnrecognizedVMOptions)
+org.gradle.jvmargs=-XX:+IgnoreUnrecognizedVMOptions \
+  --add-exports='jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED' \
+  --add-exports='jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED' \
+  --add-exports='jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED' \
+  --add-exports='jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED' \
+  --add-exports='jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,8 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=8cc27038d5dbd815759851ba53e70cf62e481b87494cc97cfd97982ada5ba634
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionSha256Sum=72f44c9f8ebcb1af43838f45ee5c4aa9c5444898b3468ab3f4af7b6076c5bc3f
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +82,11 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -114,7 +114,6 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 
 # Determine the Java command to use to start the JVM.
@@ -133,22 +132,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -165,7 +171,6 @@ fi
 # For Cygwin or MSYS, switch paths to Windows format before running java
 if "$cygwin" || "$msys" ; then
     APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
     JAVACMD=$( cygpath --unix "$JAVACMD" )
 
@@ -193,18 +198,27 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -1,89 +1,93 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto execute
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

jadx-cli/build.gradle

@@ -1,30 +0,0 @@
-plugins {
-	id 'application'
-}
-
-dependencies {
-	implementation(project(':jadx-core'))
-
-	runtimeOnly(project(':jadx-plugins:jadx-dex-input'))
-	runtimeOnly(project(':jadx-plugins:jadx-java-input'))
-	runtimeOnly(project(':jadx-plugins:jadx-java-convert'))
-	runtimeOnly(project(':jadx-plugins:jadx-smali-input'))
-
-	implementation 'com.beust:jcommander:1.82'
-	implementation 'ch.qos.logback:logback-classic:1.2.10'
-}
-
-application {
-	applicationName = 'jadx'
-	mainClass.set('jadx.cli.JadxCLI')
-	applicationDefaultJvmArgs = ['-Xms128M', '-Xmx4g', '-XX:+UseG1GC']
-}
-
-applicationDistribution.with {
-	into('') {
-		from '../.'
-		include 'README.md'
-		include 'NOTICE'
-		include 'LICENSE'
-	}
-}

jadx-cli/build.gradle.kts

@@ -0,0 +1,56 @@
+plugins {
+	id("jadx-java")
+	id("jadx-library")
+	id("application")
+
+	// use shadow only for application scripts, jar will be copied from jadx-gui
+	id("com.gradleup.shadow") version "8.3.8"
+}
+
+dependencies {
+	implementation(project(":jadx-core"))
+	implementation(project(":jadx-plugins-tools"))
+	implementation(project(":jadx-commons:jadx-app-commons"))
+
+	runtimeOnly(project(":jadx-plugins:jadx-dex-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-java-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-java-convert"))
+	runtimeOnly(project(":jadx-plugins:jadx-smali-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-rename-mappings"))
+	runtimeOnly(project(":jadx-plugins:jadx-kotlin-metadata"))
+	runtimeOnly(project(":jadx-plugins:jadx-kotlin-source-debug-extension"))
+	runtimeOnly(project(":jadx-plugins:jadx-xapk-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-aab-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-apkm-input"))
+	runtimeOnly(project(":jadx-plugins:jadx-apks-input"))
+
+	implementation("org.jcommander:jcommander:2.0")
+	implementation("ch.qos.logback:logback-classic:1.5.22")
+	implementation("com.google.code.gson:gson:2.13.2")
+}
+
+application {
+	applicationName = "jadx"
+	mainClass.set("jadx.cli.JadxCLI")
+	applicationDefaultJvmArgs =
+		listOf(
+			"-XX:+IgnoreUnrecognizedVMOptions",
+			"-Xms256M",
+			"-XX:MaxRAMPercentage=70.0",
+			"-XX:ParallelGCThreads=3",
+			// disable zip checks (#1962)
+			"-Djdk.util.zip.disableZip64ExtraFieldValidation=true",
+			// Foreign API access for 'directories' library (Windows only)
+			"--enable-native-access=ALL-UNNAMED",
+		)
+	applicationDistribution.from("$rootDir") {
+		include("README.md")
+		include("NOTICE")
+		include("LICENSE")
+	}
+}
+
+tasks.shadowJar {
+	// shadow jar not needed
+	configurations = listOf()
+}

jadx-cli/src/main/java/jadx/cli/JCommanderWrapper.java

@@ -4,112 +4,238 @@ import java.io.PrintStream;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.LinkedHashMap;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.function.Supplier;
 
 import org.jetbrains.annotations.Nullable;
 
 import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
 import com.beust.jcommander.ParameterDescription;
 import com.beust.jcommander.ParameterException;
 import com.beust.jcommander.Parameterized;
 
 import jadx.api.JadxDecompiler;
+import jadx.api.plugins.JadxPluginInfo;
+import jadx.api.plugins.options.JadxPluginOptions;
+import jadx.api.plugins.options.OptionDescription;
+import jadx.core.plugins.JadxPluginManager;
+import jadx.core.plugins.PluginContext;
+import jadx.core.utils.Utils;
 
-public class JCommanderWrapper<T> {
+public class JCommanderWrapper {
 	private final JCommander jc;
+	private final JadxCLIArgs argsObj;
 
-	public JCommanderWrapper(T obj) {
-		this.jc = JCommander.newBuilder().addObject(obj).build();
+	public JCommanderWrapper(JadxCLIArgs argsObj) {
+		JCommander.Builder builder = JCommander.newBuilder().addObject(argsObj);
+		builder.acceptUnknownOptions(true); // workaround for "default" command
+		JadxCLICommands.append(builder);
+		this.jc = builder.build();
+		this.argsObj = argsObj;
 	}
 
 	public boolean parse(String[] args) {
 		try {
-			jc.parse(args);
+			String[] fixedArgs = fixArgsForEmptySaveConfig(args);
+			jc.parse(fixedArgs);
+			applyFiles(argsObj);
 			return true;
 		} catch (ParameterException e) {
 			System.err.println("Arguments parse error: " + e.getMessage());
-			printUsage();
 			return false;
 		}
 	}
 
-	public void overrideProvided(T obj) {
-		List<ParameterDescription> fieldsParams = jc.getParameters();
-		List<ParameterDescription> parameters = new ArrayList<>(1 + fieldsParams.size());
-		parameters.add(jc.getMainParameterValue());
-		parameters.addAll(fieldsParams);
-		for (ParameterDescription parameter : parameters) {
+	public void overrideProvided(JadxCLIArgs obj) {
+		applyFiles(obj);
+		for (ParameterDescription parameter : jc.getParameters()) {
 			if (parameter.isAssigned()) {
-				// copy assigned field value to obj
-				Parameterized parameterized = parameter.getParameterized();
-				Object val = parameterized.get(parameter.getObject());
-				parameterized.set(obj, val);
+				overrideProperty(obj, parameter);
 			}
 		}
 	}
 
+	public boolean processCommands() {
+		String parsedCommand = jc.getParsedCommand();
+		if (parsedCommand == null) {
+			return false;
+		}
+		return JadxCLICommands.process(this, jc, parsedCommand);
+	}
+
+	/**
+	 * The main parameter parsing doesn't work if accepting unknown options
+	 */
+	private void applyFiles(JadxCLIArgs argsObj) {
+		argsObj.setFiles(jc.getUnknownOptions());
+	}
+
+	/**
+	 * Override assigned field value to obj
+	 */
+	private static void overrideProperty(JadxCLIArgs obj, ParameterDescription parameter) {
+		Parameterized parameterized = parameter.getParameterized();
+		Object providedValue = parameterized.get(parameter.getObject());
+		Object newValue = mergeValues(parameterized.getType(), providedValue, () -> parameterized.get(obj));
+		parameterized.set(obj, newValue);
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	private static Object mergeValues(Class<?> type, Object value, Supplier<Object> prevValueProvider) {
+		if (type.isAssignableFrom(Map.class)) {
+			// merge maps instead replacing whole map
+			Map prevMap = (Map) prevValueProvider.get();
+			return Utils.mergeMaps(prevMap, (Map) value); // value map will override keys in prevMap
+		}
+		// simple override
+		return value;
+	}
+
+	/**
+	 * Workaround to allow empty value (i.e. zero arity) for '--save-config' option
+	 * Insert empty string arg if another option start right after this one, or it is a last one.
+	 */
+	private String[] fixArgsForEmptySaveConfig(String[] args) {
+		int len = args.length;
+		for (int i = 0; i < len; i++) {
+			String arg = args[i];
+			if (arg.equals("--save-config")) {
+				int next = i + 1;
+				if (next == len) {
+					return insertEmptyArg(args, next, true);
+				}
+				if (next < len) {
+					String nextArg = args[next];
+					if (nextArg.startsWith("-")) {
+						return insertEmptyArg(args, next, false);
+					}
+				}
+				break;
+			}
+		}
+		return args;
+	}
+
+	private static String[] insertEmptyArg(String[] args, int i, boolean add) {
+		List<String> strings = new ArrayList<>(Arrays.asList(args));
+		if (add) {
+			strings.add("");
+		} else {
+			strings.add(i, "");
+		}
+		return strings.toArray(new String[0]);
+	}
+
 	public void printUsage() {
-		// print usage in not sorted fields order (by default its sorted by description)
+		LogHelper.setLogLevel(LogHelper.LogLevelEnum.ERROR); // mute logger while printing help
+
+		// print usage in not sorted fields order (by default sorted by description)
 		PrintStream out = System.out;
 		out.println();
 		out.println("jadx - dex to java decompiler, version: " + JadxDecompiler.getVersion());
 		out.println();
-		out.println("usage: jadx [options] " + jc.getMainParameterDescription());
-		out.println("options:");
+		out.println("usage: jadx [command] [options] " + jc.getMainParameterDescription());
 
-		List<ParameterDescription> params = jc.getParameters();
-		Map<String, ParameterDescription> paramsMap = new LinkedHashMap<>(params.size());
-		int maxNamesLen = 0;
-		for (ParameterDescription p : params) {
-			paramsMap.put(p.getParameterized().getName(), p);
-			int len = p.getNames().length();
-			if (len > maxNamesLen) {
-				maxNamesLen = len;
-			}
+		out.println("commands (use '<command> --help' for command options):");
+		for (String command : jc.getCommands().keySet()) {
+			out.println("  " + command + "\t  - " + jc.getUsageFormatter().getCommandDescription(command));
 		}
+		out.println();
 
-		JadxCLIArgs args = (JadxCLIArgs) jc.getObjects().get(0);
-		for (Field f : getFields(args.getClass())) {
-			String name = f.getName();
-			ParameterDescription p = paramsMap.get(name);
-			if (p == null) {
-				continue;
-			}
-			StringBuilder opt = new StringBuilder();
-			opt.append("  ").append(p.getNames());
-			String description = p.getDescription();
-			addSpaces(opt, maxNamesLen - opt.length() + 3);
-			if (description.contains("\n")) {
-				String[] lines = description.split("\n");
-				opt.append("- ").append(lines[0]);
-				for (int i = 1; i < lines.length; i++) {
-					opt.append('\n');
-					addSpaces(opt, maxNamesLen + 5);
-					opt.append(lines[i]);
-				}
-			} else {
-				opt.append("- ").append(description);
-			}
-			String defaultValue = getDefaultValue(args, f, opt);
-			if (defaultValue != null && !description.contains("(default)")) {
-				opt.append(", default: ").append(defaultValue);
-			}
-			out.println(opt);
-		}
+		int maxNamesLen = printOptions(jc, out, true);
+		out.println(appendPluginOptions(maxNamesLen));
+		out.println();
+		out.println("Environment variables:");
+		out.println("  JADX_DISABLE_XML_SECURITY - set to 'true' to disable all security checks for XML files");
+		out.println("  JADX_DISABLE_ZIP_SECURITY - set to 'true' to disable all security checks for zip files");
+		out.println("  JADX_ZIP_MAX_ENTRIES_COUNT - maximum allowed number of entries in zip files (default: 100 000)");
+		out.println("  JADX_CONFIG_DIR - custom config directory, using system by default");
+		out.println("  JADX_CACHE_DIR - custom cache directory, using system by default");
+		out.println("  JADX_TMP_DIR - custom temp directory, using system by default");
+		out.println();
 		out.println("Examples:");
 		out.println("  jadx -d out classes.dex");
 		out.println("  jadx --rename-flags \"none\" classes.dex");
 		out.println("  jadx --rename-flags \"valid, printable\" classes.dex");
 		out.println("  jadx --log-level ERROR app.apk");
+		out.println("  jadx -Pdex-input.verify-checksum=no app.apk");
+	}
+
+	public void printUsage(JCommander subCommander) {
+		PrintStream out = System.out;
+		out.println("usage: " + subCommander.getProgramName() + " [options]");
+		printOptions(subCommander, out, false);
+	}
+
+	private static int printOptions(JCommander jc, PrintStream out, boolean addDefaults) {
+		out.println("options:");
+
+		List<ParameterDescription> params = jc.getParameters();
+		Map<String, ParameterDescription> paramsMap = new HashMap<>(params.size());
+		int maxNamesLen = 0;
+		for (ParameterDescription p : params) {
+			paramsMap.put(p.getParameterized().getName(), p);
+			int len = p.getNames().length();
+			String valueDesc = getValueDesc(p);
+			if (valueDesc != null) {
+				len += 1 + valueDesc.length();
+			}
+			maxNamesLen = Math.max(maxNamesLen, len);
+		}
+		maxNamesLen += 3;
+
+		Object args = jc.getObjects().get(0);
+		for (Field f : getFields(args.getClass())) {
+			String name = f.getName();
+			ParameterDescription p = paramsMap.get(name);
+			if (p == null || p.getParameter().hidden()) {
+				continue;
+			}
+			StringBuilder opt = new StringBuilder();
+			opt.append("  ").append(p.getNames());
+			String valueDesc = getValueDesc(p);
+			if (valueDesc != null) {
+				opt.append(' ').append(valueDesc);
+			}
+			addSpaces(opt, maxNamesLen - opt.length());
+			String description = p.getDescription();
+			if (description.contains("\n")) {
+				String[] lines = description.split("\n");
+				opt.append("- ").append(lines[0]);
+				for (int i = 1; i < lines.length; i++) {
+					opt.append('\n');
+					addSpaces(opt, maxNamesLen + 2);
+					opt.append(lines[i]);
+				}
+			} else {
+				opt.append("- ").append(description);
+			}
+			if (addDefaults) {
+				String defaultValue = getDefaultValue(args, f);
+				if (defaultValue != null
+						&& !defaultValue.isEmpty()
+						&& !description.contains("(default)")) {
+					opt.append(", default: ").append(defaultValue);
+				}
+			}
+			out.println(opt);
+		}
+		return maxNamesLen;
+	}
+
+	private static @Nullable String getValueDesc(ParameterDescription p) {
+		Parameter parameterAnnotation = p.getParameterAnnotation();
+		return parameterAnnotation == null ? null : parameterAnnotation.defaultValueDescription();
 	}
 
 	/**
 	 * Get all declared fields of the specified class and all super classes
 	 */
-	private List<Field> getFields(Class<?> clazz) {
+	private static List<Field> getFields(Class<?> clazz) {
 		List<Field> fieldList = new ArrayList<>();
 		while (clazz != null) {
 			fieldList.addAll(Arrays.asList(clazz.getDeclaredFields()));
@@ -119,7 +245,7 @@ public class JCommanderWrapper<T> {
 	}
 
 	@Nullable
-	private String getDefaultValue(JadxCLIArgs args, Field f, StringBuilder opt) {
+	private static String getDefaultValue(Object args, Field f) {
 		try {
 			Class<?> fieldType = f.getType();
 			if (fieldType == int.class) {
@@ -145,4 +271,51 @@ public class JCommanderWrapper<T> {
 			str.append(' ');
 		}
 	}
+
+	private String appendPluginOptions(int maxNamesLen) {
+		StringBuilder sb = new StringBuilder();
+		// load and init all options plugins to print all options
+		try (JadxDecompiler decompiler = new JadxDecompiler(argsObj.toJadxArgs())) {
+			JadxPluginManager pluginManager = decompiler.getPluginManager();
+			pluginManager.load(decompiler.getArgs().getPluginLoader());
+			pluginManager.initAll();
+			try {
+				for (PluginContext context : pluginManager.getAllPluginContexts()) {
+					JadxPluginOptions options = context.getOptions();
+					if (options != null) {
+						appendPlugin(context.getPluginInfo(), context.getOptions(), sb, maxNamesLen);
+					}
+				}
+			} finally {
+				pluginManager.unloadAll();
+			}
+		}
+		if (sb.length() == 0) {
+			return "";
+		}
+		return "\nPlugin options (-P<name>=<value>):" + sb;
+	}
+
+	private boolean appendPlugin(JadxPluginInfo pluginInfo, JadxPluginOptions options, StringBuilder out, int maxNamesLen) {
+		List<OptionDescription> descs = options.getOptionsDescriptions();
+		if (descs.isEmpty()) {
+			return false;
+		}
+		out.append("\n  ");
+		out.append(pluginInfo.getPluginId()).append(": ").append(pluginInfo.getDescription());
+		for (OptionDescription desc : descs) {
+			StringBuilder opt = new StringBuilder();
+			opt.append("    - ").append(desc.name());
+			addSpaces(opt, maxNamesLen - opt.length());
+			opt.append("- ").append(desc.description());
+			if (!desc.values().isEmpty()) {
+				opt.append(", values: ").append(desc.values());
+			}
+			if (desc.defaultValue() != null) {
+				opt.append(", default: ").append(desc.defaultValue());
+			}
+			out.append("\n").append(opt);
+		}
+		return true;
+	}
 }

jadx-cli/src/main/java/jadx/cli/JadxAppCommon.java

@@ -0,0 +1,48 @@
+package jadx.cli;
+
+import java.util.Set;
+
+import jadx.api.JadxArgs;
+import jadx.api.security.JadxSecurityFlag;
+import jadx.api.security.impl.JadxSecurity;
+import jadx.commons.app.JadxCommonEnv;
+import jadx.zip.security.DisabledZipSecurity;
+import jadx.zip.security.IJadxZipSecurity;
+import jadx.zip.security.JadxZipSecurity;
+
+public class JadxAppCommon {
+
+	public static void applyEnvVars(JadxArgs jadxArgs) {
+		Set<JadxSecurityFlag> flags = JadxSecurityFlag.all();
+		IJadxZipSecurity zipSecurity;
+
+		boolean disableXmlSecurity = JadxCommonEnv.getBool("JADX_DISABLE_XML_SECURITY", false);
+		if (disableXmlSecurity) {
+			flags.remove(JadxSecurityFlag.SECURE_XML_PARSER);
+			// TODO: not related to 'xml security', but kept for compatibility
+			flags.remove(JadxSecurityFlag.VERIFY_APP_PACKAGE);
+		}
+
+		boolean disableZipSecurity = JadxCommonEnv.getBool("JADX_DISABLE_ZIP_SECURITY", false);
+		if (disableZipSecurity) {
+			flags.remove(JadxSecurityFlag.SECURE_ZIP_READER);
+			zipSecurity = DisabledZipSecurity.INSTANCE;
+		} else {
+			JadxZipSecurity jadxZipSecurity = new JadxZipSecurity();
+			int maxZipEntriesCount = JadxCommonEnv.getInt("JADX_ZIP_MAX_ENTRIES_COUNT", -2);
+			if (maxZipEntriesCount != -2) {
+				jadxZipSecurity.setMaxEntriesCount(maxZipEntriesCount);
+			}
+			int zipBombMinUncompressedSize = JadxCommonEnv.getInt("JADX_ZIP_BOMB_MIN_UNCOMPRESSED_SIZE", -2);
+			if (zipBombMinUncompressedSize != -2) {
+				jadxZipSecurity.setZipBombMinUncompressedSize(zipBombMinUncompressedSize);
+			}
+			int setZipBombDetectionFactor = JadxCommonEnv.getInt("JADX_ZIP_BOMB_DETECTION_FACTOR", -2);
+			if (setZipBombDetectionFactor != -2) {
+				jadxZipSecurity.setZipBombDetectionFactor(setZipBombDetectionFactor);
+			}
+			zipSecurity = jadxZipSecurity;
+		}
+		jadxArgs.setSecurity(new JadxSecurity(flags, zipSecurity));
+	}
+}

jadx-cli/src/main/java/jadx/cli/JadxCLI.java

@@ -1,48 +1,78 @@
 package jadx.cli;
 
+import java.util.function.Consumer;
+
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jadx.api.JadxArgs;
 import jadx.api.JadxDecompiler;
+import jadx.api.impl.AnnotatedCodeWriter;
 import jadx.api.impl.NoOpCodeCache;
 import jadx.api.impl.SimpleCodeWriter;
+import jadx.api.usage.impl.EmptyUsageInfoCache;
+import jadx.cli.LogHelper.LogLevelEnum;
+import jadx.cli.config.JadxConfigAdapter;
+import jadx.cli.plugins.JadxFilesGetter;
 import jadx.core.utils.exceptions.JadxArgsValidateException;
-import jadx.core.utils.files.FileUtils;
+import jadx.plugins.tools.JadxExternalPluginsLoader;
 
 public class JadxCLI {
 	private static final Logger LOG = LoggerFactory.getLogger(JadxCLI.class);
 
 	public static void main(String[] args) {
-		int result = 0;
+		int result = 1;
 		try {
 			result = execute(args);
-		} catch (JadxArgsValidateException e) {
-			LOG.error("Incorrect arguments: {}", e.getMessage());
-			result = 1;
-		} catch (Exception e) {
-			LOG.error("jadx error: {}", e.getMessage(), e);
-			result = 1;
 		} finally {
-			FileUtils.deleteTempRootDir();
 			System.exit(result);
 		}
 	}
 
 	public static int execute(String[] args) {
-		JadxCLIArgs jadxArgs = new JadxCLIArgs();
-		if (jadxArgs.processArgs(args)) {
-			return processAndSave(jadxArgs);
-		}
-		return 0;
+		return execute(args, null);
 	}
 
-	private static int processAndSave(JadxCLIArgs cliArgs) {
+	public static int execute(String[] args, @Nullable Consumer<JadxArgs> argsMod) {
+		try {
+			JadxCLIArgs cliArgs = JadxCLIArgs.processArgs(args,
+					new JadxCLIArgs(),
+					new JadxConfigAdapter<>(JadxCLIArgs.class, "cli"));
+			if (cliArgs == null) {
+				return 0;
+			}
+			JadxArgs jadxArgs = buildArgs(cliArgs);
+			if (argsMod != null) {
+				argsMod.accept(jadxArgs);
+			}
+			return runSave(jadxArgs, cliArgs);
+		} catch (JadxArgsValidateException e) {
+			LOG.error("Incorrect arguments: {}", e.getMessage());
+			return 1;
+		} catch (Throwable e) {
+			LOG.error("Process error:", e);
+			return 1;
+		}
+	}
+
+	private static JadxArgs buildArgs(JadxCLIArgs cliArgs) {
 		JadxArgs jadxArgs = cliArgs.toJadxArgs();
 		jadxArgs.setCodeCache(new NoOpCodeCache());
-		jadxArgs.setCodeWriterProvider(SimpleCodeWriter::new);
+		jadxArgs.setUsageInfoCache(new EmptyUsageInfoCache());
+		jadxArgs.setPluginLoader(new JadxExternalPluginsLoader());
+		jadxArgs.setFilesGetter(JadxFilesGetter.INSTANCE);
+		initCodeWriterProvider(jadxArgs);
+		JadxAppCommon.applyEnvVars(jadxArgs);
+		return jadxArgs;
+	}
+
+	private static int runSave(JadxArgs jadxArgs, JadxCLIArgs cliArgs) {
 		try (JadxDecompiler jadx = new JadxDecompiler(jadxArgs)) {
 			jadx.load();
+			if (checkForErrors(jadx)) {
+				return 2;
+			}
 			if (!SingleClassMode.process(jadx, cliArgs)) {
 				save(jadx);
 			}
@@ -50,21 +80,55 @@ public class JadxCLI {
 			if (errorsCount != 0) {
 				jadx.printErrorsReport();
 				LOG.error("finished with errors, count: {}", errorsCount);
-			} else {
-				LOG.info("done");
+				return 3;
+			}
+			LOG.info("done");
+			return 0;
+		}
+	}
+
+	private static void initCodeWriterProvider(JadxArgs jadxArgs) {
+		switch (jadxArgs.getOutputFormat()) {
+			case JAVA:
+				jadxArgs.setCodeWriterProvider(SimpleCodeWriter::new);
+				break;
+			case JSON:
+				// needed for code offsets and source lines
+				jadxArgs.setCodeWriterProvider(AnnotatedCodeWriter::new);
+				break;
+		}
+	}
+
+	private static boolean checkForErrors(JadxDecompiler jadx) {
+		if (jadx.getRoot().getClasses().isEmpty()) {
+			if (jadx.getArgs().isSkipResources()) {
+				LOG.error("Load failed! No classes for decompile!");
+				return true;
+			}
+			if (!jadx.getArgs().isSkipSources()) {
+				LOG.warn("No classes to decompile; decoding resources only");
+				jadx.getArgs().setSkipSources(true);
 			}
 		}
-		return 0;
+		int errorsCount = jadx.getErrorsCount();
+		if (errorsCount > 0) {
+			LOG.error("Loading finished with errors! Count: {}", errorsCount);
+			// continue processing
+		}
+		return false;
 	}
 
 	private static void save(JadxDecompiler jadx) {
-		if (LogHelper.getLogLevel() == LogHelper.LogLevelEnum.QUIET) {
+		if (LogHelper.getLogLevel() == LogLevelEnum.QUIET) {
 			jadx.save();
 		} else {
+			LOG.info("processing ...");
 			jadx.save(500, (done, total) -> {
 				int progress = (int) (done * 100.0 / total);
 				System.out.printf("INFO  - progress: %d of %d (%d%%)\r", done, total, progress);
 			});
+			// dumb line clear :)
+			System.out.print("                                                             \r");
 		}
 	}
 }

jadx-cli/src/main/java/jadx/cli/JadxCLICommands.java

@@ -0,0 +1,37 @@
+package jadx.cli;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import com.beust.jcommander.JCommander;
+
+import jadx.cli.commands.CommandPlugins;
+import jadx.cli.commands.ICommand;
+import jadx.core.utils.exceptions.JadxArgsValidateException;
+
+public class JadxCLICommands {
+	private static final Map<String, ICommand> COMMANDS_MAP = new LinkedHashMap<>();
+
+	static {
+		JadxCLICommands.register(new CommandPlugins());
+	}
+
+	public static void register(ICommand command) {
+		COMMANDS_MAP.put(command.name(), command);
+	}
+
+	public static void append(JCommander.Builder builder) {
+		COMMANDS_MAP.forEach(builder::addCommand);
+	}
+
+	public static boolean process(JCommanderWrapper jcw, JCommander jc, String parsedCommand) {
+		ICommand command = COMMANDS_MAP.get(parsedCommand);
+		if (command == null) {
+			throw new JadxArgsValidateException("Unknown command: " + parsedCommand
+					+ ". Expected one of: " + COMMANDS_MAP.keySet());
+		}
+		JCommander subCommander = jc.getCommands().get(parsedCommand);
+		command.process(jcw, subCommander);
+		return true;
+	}
+}

jadx-cli/src/main/java/jadx/cli/LogHelper.java

@@ -1,10 +1,9 @@
 package jadx.cli;
 
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.LoggerFactory;
 
-import com.beust.jcommander.IStringConverter;
-
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 
@@ -32,34 +31,52 @@ public class LogHelper {
 		}
 	}
 
+	@Nullable("For disable log level control")
 	private static LogLevelEnum logLevelValue;
 
-	public static void setLogLevelFromArgs(JadxCLIArgs args) {
-		if (isCustomLogConfig()) {
-			return;
-		}
-		LogLevelEnum logLevel = args.logLevel;
-		if (args.quiet) {
-			logLevel = LogLevelEnum.QUIET;
-		} else if (args.verbose) {
-			logLevel = LogLevelEnum.DEBUG;
-		}
-
-		applyLogLevel(logLevel);
+	public static void initLogLevel(JadxCLIArgs args) {
+		logLevelValue = getLogLevelFromArgs(args);
 	}
 
-	public static void applyLogLevel(LogLevelEnum logLevel) {
-		logLevelValue = logLevel;
+	private static LogLevelEnum getLogLevelFromArgs(JadxCLIArgs args) {
+		if (isCustomLogConfig()) {
+			return null;
+		}
+		if (args.quiet) {
+			args.logLevel = LogLevelEnum.QUIET;
+		} else if (args.verbose) {
+			args.logLevel = LogLevelEnum.DEBUG;
+		}
+		return args.logLevel;
+	}
 
+	public static void setLogLevel(LogLevelEnum newLogLevel) {
+		logLevelValue = newLogLevel;
+		applyLogLevel(logLevelValue);
+	}
+
+	public static void applyLogLevels() {
+		if (logLevelValue == null) {
+			return;
+		}
+		applyLogLevel(logLevelValue);
+		if (logLevelValue == LogLevelEnum.PROGRESS) {
+			fixForShowProgress();
+		}
+	}
+
+	/**
+	 * Show progress: change to 'INFO' for control classes
+	 */
+	private static void fixForShowProgress() {
+		setLevelForClass(JadxCLI.class, Level.INFO);
+		setLevelForClass(JadxDecompiler.class, Level.INFO);
+		setLevelForClass(SingleClassMode.class, Level.INFO);
+	}
+
+	private static void applyLogLevel(@NotNull LogLevelEnum logLevel) {
 		Logger rootLogger = (Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
 		rootLogger.setLevel(logLevel.getLevel());
-
-		if (logLevel == LogLevelEnum.PROGRESS) {
-			// show progress for all levels except quiet
-			setLevelForClass(JadxCLI.class, Level.INFO);
-			setLevelForClass(JadxDecompiler.class, Level.INFO);
-			setLevelForClass(SingleClassMode.class, Level.INFO);
-		}
 	}
 
 	@Nullable
@@ -91,18 +108,4 @@ public class LogHelper {
 		}
 		return false;
 	}
-
-	public static class LogLevelConverter implements IStringConverter<LogLevelEnum> {
-
-		@Override
-		public LogLevelEnum convert(String value) {
-			try {
-				return LogLevelEnum.valueOf(value.toUpperCase());
-			} catch (Exception e) {
-				throw new IllegalArgumentException(
-						'\'' + value + "' is unknown log level, possible values are "
-								+ JadxCLIArgs.enumValuesString(LogLevelEnum.values()));
-			}
-		}
-	}
 }

jadx-cli/src/main/java/jadx/cli/SingleClassMode.java

@@ -12,6 +12,7 @@ import jadx.api.JadxDecompiler;
 import jadx.core.dex.attributes.AFlag;
 import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.visitors.SaveCode;
+import jadx.core.utils.exceptions.JadxArgsValidateException;
 import jadx.core.utils.exceptions.JadxRuntimeException;
 import jadx.core.utils.files.FileUtils;
 
@@ -33,10 +34,10 @@ public class SingleClassMode {
 						.findFirst().orElse(null);
 			}
 			if (clsForProcess == null) {
-				throw new JadxRuntimeException("Input class not found: " + singleClass);
+				throw new JadxArgsValidateException("Input class not found: " + singleClass);
 			}
 			if (clsForProcess.contains(AFlag.DONT_GENERATE)) {
-				throw new JadxRuntimeException("Input class can't be saved by currect jadx settings (marked as DONT_GENERATE)");
+				throw new JadxArgsValidateException("Input class can't be saved by current jadx settings (marked as DONT_GENERATE)");
 			}
 			if (clsForProcess.isInner()) {
 				clsForProcess = clsForProcess.getTopParentClass();
@@ -52,7 +53,7 @@ public class SingleClassMode {
 			if (size == 1) {
 				clsForProcess = classes.get(0);
 			} else {
-				throw new JadxRuntimeException("Found " + size + " classes, single class output can't be used");
+				throw new JadxArgsValidateException("Found " + size + " classes, single class output can't be used");
 			}
 		}
 		ICodeInfo codeInfo;

jadx-cli/src/main/java/jadx/cli/clst/ConvertToClsSet.java

@@ -2,7 +2,6 @@ package jadx.cli.clst;
 
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -12,13 +11,11 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jadx.api.JadxArgs;
-import jadx.api.plugins.JadxPluginManager;
-import jadx.api.plugins.input.JadxInputPlugin;
-import jadx.api.plugins.input.data.ILoadResult;
+import jadx.api.JadxDecompiler;
+import jadx.api.args.UseSourceNameAsClassNameAlias;
 import jadx.core.clsp.ClsSet;
-import jadx.core.dex.nodes.ClassNode;
 import jadx.core.dex.nodes.RootNode;
-import jadx.core.dex.visitors.SignatureProcessor;
+import jadx.core.utils.files.FileUtils;
 
 /**
  * Utility class for convert dex or jar to jadx classes set (.jcst)
@@ -27,41 +24,50 @@ public class ConvertToClsSet {
 	private static final Logger LOG = LoggerFactory.getLogger(ConvertToClsSet.class);
 
 	public static void usage() {
-		LOG.info("<output .jcst or .jar file> <several input dex or jar files> ");
+		LOG.info("<android API level (number)> <output .jcst file> <several input dex or jar files> ");
+		LOG.info("Arguments to update core.jcst: "
+				+ "<android API level (number)> "
+				+ "<jadx root>/jadx-core/src/main/resources/clst/core.jcst "
+				+ "<sdk_root>/platforms/android-<api level>/android.jar"
+				+ "<sdk_root>/platforms/android-<api level>/optional/android.car.jar "
+				+ "<sdk_root>/platforms/android-<api level>/optional/org.apache.http.legacy.jar");
 	}
 
-	public static void main(String[] args) throws Exception {
-		if (args.length < 2) {
+	public static void main(String[] args) {
+		if (args.length != 5) {
 			usage();
 			System.exit(1);
 		}
-		List<Path> inputPaths = Stream.of(args).map(Paths::get).collect(Collectors.toList());
+		int androidApiLevel = Integer.parseInt(args[0]);
+		List<Path> inputPaths = Stream.of(args).skip(1).map(Paths::get).collect(Collectors.toList());
 		Path output = inputPaths.remove(0);
 
-		JadxPluginManager pluginManager = new JadxPluginManager();
-		pluginManager.load();
-		List<ILoadResult> loadedInputs = new ArrayList<>();
-		for (JadxInputPlugin inputPlugin : pluginManager.getInputPlugins()) {
-			loadedInputs.add(inputPlugin.loadFiles(inputPaths));
-		}
-
 		JadxArgs jadxArgs = new JadxArgs();
+		jadxArgs.setInputFiles(FileUtils.toFiles(inputPaths));
+
+		// disable not needed passes executed at prepare stage
+		jadxArgs.setDeobfuscationOn(false);
 		jadxArgs.setRenameFlags(EnumSet.noneOf(JadxArgs.RenameEnum.class));
-		RootNode root = new RootNode(jadxArgs);
-		root.loadClasses(loadedInputs);
+		jadxArgs.setUseSourceNameAsClassNameAlias(UseSourceNameAsClassNameAlias.NEVER);
+		jadxArgs.setMoveInnerClasses(false);
+		jadxArgs.setInlineAnonymousClasses(false);
+		jadxArgs.setInlineMethods(false);
 
-		// from pre-decompilation stage run only SignatureProcessor
-		SignatureProcessor signatureProcessor = new SignatureProcessor();
-		signatureProcessor.init(root);
-		for (ClassNode classNode : root.getClasses()) {
-			signatureProcessor.visit(classNode);
+		// don't require/load class set file
+		jadxArgs.setLoadJadxClsSetFile(false);
+
+		try (JadxDecompiler decompiler = new JadxDecompiler(jadxArgs)) {
+			decompiler.load();
+			RootNode root = decompiler.getRoot();
+			ClsSet set = new ClsSet(root);
+			set.setAndroidApiLevel(androidApiLevel);
+			set.loadFrom(root);
+			set.save(output);
+
+			LOG.info("Output: {}", output);
+			LOG.info("done");
+		} catch (Exception e) {
+			LOG.error("Failed with error", e);
 		}
-
-		ClsSet set = new ClsSet(root);
-		set.loadFrom(root);
-		set.save(output);
-
-		LOG.info("Output: {}", output);
-		LOG.info("done");
 	}
 }

jadx-cli/src/main/java/jadx/cli/commands/CommandPlugins.java

@@ -0,0 +1,218 @@
+package jadx.cli.commands;
+
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import com.beust.jcommander.JCommander;
+import com.beust.jcommander.Parameter;
+import com.beust.jcommander.Parameters;
+
+import jadx.api.plugins.JadxPluginInfo;
+import jadx.cli.JCommanderWrapper;
+import jadx.cli.LogHelper;
+import jadx.core.utils.StringUtils;
+import jadx.plugins.tools.JadxPluginsList;
+import jadx.plugins.tools.JadxPluginsTools;
+import jadx.plugins.tools.data.JadxPluginListEntry;
+import jadx.plugins.tools.data.JadxPluginMetadata;
+import jadx.plugins.tools.data.JadxPluginUpdate;
+
+@Parameters(commandDescription = "manage jadx plugins")
+public class CommandPlugins implements ICommand {
+
+	@Parameter(names = { "-i", "--install" }, description = "install plugin with locationId", defaultValueDescription = "<locationId>")
+	protected String install;
+
+	@Parameter(names = { "-j", "--install-jar" }, description = "install plugin from jar file", defaultValueDescription = "<path-to.jar>")
+	protected String installJar;
+
+	@Parameter(names = { "-l", "--list" }, description = "list installed plugins")
+	protected boolean list;
+
+	@Parameter(names = { "-a", "--available" }, description = "list available plugins from jadx-plugins-list (aka marketplace)")
+	protected boolean available;
+
+	@Parameter(names = { "-u", "--update" }, description = "update installed plugins")
+	protected boolean update;
+
+	@Parameter(names = { "--uninstall" }, description = "uninstall plugin with pluginId", defaultValueDescription = "<pluginId>")
+	protected String uninstall;
+
+	@Parameter(names = { "--disable" }, description = "disable plugin with pluginId", defaultValueDescription = "<pluginId>")
+	protected String disable;
+
+	@Parameter(names = { "--enable" }, description = "enable plugin with pluginId", defaultValueDescription = "<pluginId>")
+	protected String enable;
+
+	@Parameter(names = { "--list-all" }, description = "list all plugins including bundled and dropins")
+	protected boolean listAll;
+
+	@Parameter(
+			names = { "--list-versions" },
+			description = "fetch latest versions of plugin from locationId (will download all artefacts, limited to 10)",
+			defaultValueDescription = "<locationId>"
+	)
+	protected String listVersions;
+
+	@Parameter(names = { "-h", "--help" }, description = "print this help", help = true)
+	protected boolean printHelp = false;
+
+	@Override
+	public String name() {
+		return "plugins";
+	}
+
+	@SuppressWarnings("UnnecessaryReturnStatement")
+	@Override
+	public void process(JCommanderWrapper jcw, JCommander subCommander) {
+		if (printHelp) {
+			jcw.printUsage(subCommander);
+			return;
+		}
+		Set<String> unknownOptions = new HashSet<>(subCommander.getUnknownOptions());
+		boolean verbose = unknownOptions.remove("-v") || unknownOptions.remove("--verbose");
+		LogHelper.setLogLevel(verbose ? LogHelper.LogLevelEnum.DEBUG : LogHelper.LogLevelEnum.INFO);
+
+		if (!unknownOptions.isEmpty()) {
+			System.out.println("Error: found unknown options: " + unknownOptions);
+		}
+
+		if (install != null) {
+			installPlugin(install);
+			return;
+		}
+		if (installJar != null) {
+			installPlugin("file:" + installJar);
+			return;
+		}
+		if (uninstall != null) {
+			boolean uninstalled = JadxPluginsTools.getInstance().uninstall(uninstall);
+			System.out.println(uninstalled ? "Uninstalled" : "Plugin not found");
+			return;
+		}
+		if (update) {
+			List<JadxPluginUpdate> updates = JadxPluginsTools.getInstance().updateAll();
+			if (updates.isEmpty()) {
+				System.out.println("No updates");
+			} else {
+				System.out.println("Installed updates: " + updates.size());
+				for (JadxPluginUpdate update : updates) {
+					System.out.println("  " + update.getPluginId() + ": " + update.getOldVersion() + " -> " + update.getNewVersion());
+				}
+			}
+			return;
+		}
+		if (list) {
+			printPlugins(JadxPluginsTools.getInstance().getInstalled());
+			return;
+		}
+		if (listAll) {
+			printAllPlugins();
+			return;
+		}
+		if (listVersions != null) {
+			printVersions(listVersions, 10);
+			return;
+		}
+		if (available) {
+			List<JadxPluginListEntry> availableList = JadxPluginsList.getInstance().get();
+			System.out.println("Available plugins: " + availableList.size());
+			for (JadxPluginListEntry plugin : availableList) {
+				System.out.println(" - " + plugin.getName() + ": " + plugin.getDescription()
+						+ " (" + plugin.getLocationId() + ")");
+			}
+			return;
+		}
+
+		if (disable != null) {
+			if (JadxPluginsTools.getInstance().changeDisabledStatus(disable, true)) {
+				System.out.println("Plugin '" + disable + "' disabled.");
+			} else {
+				System.out.println("Plugin '" + disable + "' already disabled.");
+			}
+			return;
+		}
+		if (enable != null) {
+			if (JadxPluginsTools.getInstance().changeDisabledStatus(enable, false)) {
+				System.out.println("Plugin '" + enable + "' enabled.");
+			} else {
+				System.out.println("Plugin '" + enable + "' already enabled.");
+			}
+			return;
+		}
+	}
+
+	private static void printPlugins(List<JadxPluginMetadata> installed) {
+		System.out.println("Installed plugins: " + installed.size());
+		for (JadxPluginMetadata plugin : installed) {
+			StringBuilder sb = new StringBuilder();
+			sb.append(" - ").append(plugin.getPluginId());
+			String version = plugin.getVersion();
+			if (version != null) {
+				sb.append(" (").append(version).append(')');
+			}
+			if (plugin.isDisabled()) {
+				sb.append(" (disabled)");
+			}
+			sb.append(" - ").append(plugin.getName());
+			sb.append(": ").append(formatDescription(plugin.getDescription()));
+			System.out.println(sb);
+		}
+	}
+
+	private void printVersions(String locationId, int limit) {
+		System.out.println("Loading ...");
+		List<JadxPluginMetadata> versions = JadxPluginsTools.getInstance().getVersionsByLocation(locationId, 1, limit);
+		if (versions.isEmpty()) {
+			System.out.println("No versions found");
+			return;
+		}
+		JadxPluginMetadata plugin = versions.get(0);
+		System.out.println("Versions for plugin id: " + plugin.getPluginId());
+		for (JadxPluginMetadata version : versions) {
+			StringBuilder sb = new StringBuilder();
+			sb.append(" - ").append(version.getVersion());
+			String reqVer = version.getRequiredJadxVersion();
+			if (StringUtils.notBlank(reqVer)) {
+				sb.append(", require jadx: ").append(reqVer);
+			}
+			System.out.println(sb);
+		}
+	}
+
+	private static void printAllPlugins() {
+		List<JadxPluginMetadata> installed = JadxPluginsTools.getInstance().getInstalled();
+		printPlugins(installed);
+		Set<String> installedSet = installed.stream().map(JadxPluginMetadata::getPluginId).collect(Collectors.toSet());
+
+		List<JadxPluginInfo> plugins = JadxPluginsTools.getInstance().getAllPluginsInfo();
+		System.out.println("Other plugins: " + plugins.size());
+		for (JadxPluginInfo plugin : plugins) {
+			if (!installedSet.contains(plugin.getPluginId())) {
+				System.out.println(" - " + plugin.getPluginId()
+						+ " - " + plugin.getName()
+						+ ": " + formatDescription(plugin.getDescription()));
+			}
+		}
+	}
+
+	private static String formatDescription(String desc) {
+		if (desc.contains("\n")) {
+			// remove new lines
+			desc = desc.replaceAll("\\R+", " ");
+		}
+		int maxLen = 512;
+		if (desc.length() > maxLen) {
+			// truncate very long descriptions
+			desc = desc.substring(0, maxLen) + " ...";
+		}
+		return desc;
+	}
+
+	private void installPlugin(String locationId) {
+		JadxPluginMetadata plugin = JadxPluginsTools.getInstance().install(locationId);
+		System.out.println("Plugin installed: " + plugin.getPluginId() + ":" + plugin.getVersion());
+	}
+}

jadx-cli/src/main/java/jadx/cli/commands/ICommand.java

@@ -0,0 +1,11 @@
+package jadx.cli.commands;
+
+import com.beust.jcommander.JCommander;
+
+import jadx.cli.JCommanderWrapper;
+
+public interface ICommand {
+	String name();
+
+	void process(JCommanderWrapper jcw, JCommander subCommander);
+}

jadx-cli/src/main/java/jadx/cli/config/IJadxConfig.java

@@ -0,0 +1,7 @@
+package jadx.cli.config;
+
+/**
+ * Marker interface for jadx config objects
+ */
+public interface IJadxConfig {
+}

jadx-cli/src/main/java/jadx/cli/config/JadxConfigAdapter.java

@@ -0,0 +1,109 @@
+package jadx.cli.config;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Consumer;
+
+import org.jetbrains.annotations.Nullable;
+
+import com.google.gson.ExclusionStrategy;
+import com.google.gson.FieldAttributes;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.stream.JsonReader;
+
+import jadx.commons.app.JadxCommonFiles;
+import jadx.core.utils.GsonUtils;
+import jadx.core.utils.exceptions.JadxArgsValidateException;
+import jadx.core.utils.exceptions.JadxRuntimeException;
+
+public class JadxConfigAdapter<T extends IJadxConfig> {
+	private static final ExclusionStrategy GSON_EXCLUSION_STRATEGY = new ExclusionStrategy() {
+		@Override
+		public boolean shouldSkipField(FieldAttributes f) {
+			return f.getAnnotation(JadxConfigExclude.class) != null;
+		}
+
+		@Override
+		public boolean shouldSkipClass(Class<?> clazz) {
+			return false;
+		}
+	};
+
+	private final Class<T> configCls;
+	private final String defaultConfigFileName;
+	private final Gson gson;
+
+	private Path configPath;
+
+	public JadxConfigAdapter(Class<T> configCls, String defaultConfigName) {
+		this(configCls, defaultConfigName, gsonBuilder -> {
+		});
+	}
+
+	public JadxConfigAdapter(Class<T> configCls, String defaultConfigName, Consumer<GsonBuilder> applyGsonOptions) {
+		this.configCls = configCls;
+		this.defaultConfigFileName = defaultConfigName + ".json";
+		GsonBuilder gsonBuilder = GsonUtils.defaultGsonBuilder();
+		gsonBuilder.setExclusionStrategies(GSON_EXCLUSION_STRATEGY);
+		applyGsonOptions.accept(gsonBuilder);
+		this.gson = gsonBuilder.create();
+	}
+
+	public void useConfigRef(String configRef) {
+		this.configPath = resolveConfigRef(configRef);
+	}
+
+	public Path getConfigPath() {
+		return configPath;
+	}
+
+	public String getDefaultConfigFileName() {
+		return defaultConfigFileName;
+	}
+
+	public @Nullable T load() {
+		if (!Files.isRegularFile(configPath)) {
+			// file not found
+			return null;
+		}
+		try (JsonReader reader = gson.newJsonReader(Files.newBufferedReader(configPath))) {
+			return gson.fromJson(reader, configCls);
+		} catch (Exception e) {
+			throw new JadxRuntimeException("Failed to load config file: " + configPath, e);
+		}
+	}
+
+	public void save(T configObject) {
+		try {
+			String jsonStr = gson.toJson(configObject, configCls);
+			// don't use stream writer here because serialization errors will corrupt config
+			Files.writeString(configPath, jsonStr);
+		} catch (Exception e) {
+			throw new JadxRuntimeException("Failed to save config file: " + configPath, e);
+		}
+	}
+
+	public String objectToJsonString(T configObject) {
+		return gson.toJson(configObject, configCls);
+	}
+
+	public T jsonStringToObject(String jsonStr) {
+		return gson.fromJson(jsonStr, configCls);
+	}
+
+	private Path resolveConfigRef(String configRef) {
+		if (configRef == null || configRef.isEmpty()) {
+			// use default config file
+			return JadxCommonFiles.getConfigDir().resolve(defaultConfigFileName);
+		}
+		if (configRef.contains("/") || configRef.contains("\\")) {
+			if (!configRef.toLowerCase().endsWith(".json")) {
+				throw new JadxArgsValidateException("Config file extension should be '.json'");
+			}
+			return Path.of(configRef);
+		}
+		// treat as a short name
+		return JadxCommonFiles.getConfigDir().resolve(configRef + ".json");
+	}
+}

jadx-cli/src/main/java/jadx/cli/config/JadxConfigExclude.java

@@ -0,0 +1,11 @@
+package jadx.cli.config;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface JadxConfigExclude {
+}

jadx-cli/src/main/java/jadx/cli/plugins/JadxFilesGetter.java

@@ -0,0 +1,31 @@
+package jadx.cli.plugins;
+
+import java.nio.file.Path;
+
+import jadx.commons.app.JadxCommonFiles;
+import jadx.commons.app.JadxTempFiles;
+import jadx.core.plugins.files.IJadxFilesGetter;
+
+public class JadxFilesGetter implements IJadxFilesGetter {
+
+	public static final JadxFilesGetter INSTANCE = new JadxFilesGetter();
+
+	@Override
+	public Path getConfigDir() {
+		return JadxCommonFiles.getConfigDir();
+	}
+
+	@Override
+	public Path getCacheDir() {
+		return JadxCommonFiles.getCacheDir();
+	}
+
+	@Override
+	public Path getTempDir() {
+		return JadxTempFiles.getTempRootDir();
+	}
+
+	private JadxFilesGetter() {
+		// singleton
+	}
+}

jadx-cli/src/main/java/jadx/cli/tools/ConvertArscFile.java

@@ -1,6 +1,5 @@
 package jadx.cli.tools;
 
-import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
@@ -11,8 +10,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipFile;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -20,7 +17,12 @@ import org.slf4j.LoggerFactory;
 import jadx.api.JadxArgs;
 import jadx.core.dex.nodes.RootNode;
 import jadx.core.utils.android.TextResMapFile;
-import jadx.core.xmlgen.ResTableParser;
+import jadx.core.xmlgen.ResTableBinaryParser;
+import jadx.zip.IZipEntry;
+import jadx.zip.ZipContent;
+import jadx.zip.ZipReader;
+
+import static jadx.core.utils.files.FileUtils.expandDirs;
 
 /**
  * Utility class for convert '.arsc' to simple text file with mapping id to resource name
@@ -30,7 +32,7 @@ public class ConvertArscFile {
 	private static int rewritesCount;
 
 	public static void usage() {
-		LOG.info("<res-map file> <input .arsc files>");
+		LOG.info("<res-map file> <input .arsc/android.jar files or dir>");
 		LOG.info("");
 		LOG.info("Note: If res-map already exists - it will be merged and updated");
 	}
@@ -42,6 +44,7 @@ public class ConvertArscFile {
 		}
 		List<Path> inputPaths = Stream.of(args).map(Paths::get).collect(Collectors.toList());
 		Path resMapFile = inputPaths.remove(0);
+		List<Path> inputResFiles = filterAndSort(expandDirs(inputPaths));
 		Map<Integer, String> resMap;
 		if (Files.isReadable(resMapFile)) {
 			resMap = TextResMapFile.read(resMapFile);
@@ -51,25 +54,25 @@ public class ConvertArscFile {
 		LOG.info("Input entries count: {}", resMap.size());
 
 		RootNode root = new RootNode(new JadxArgs()); // not really needed
+		ZipReader zipReader = new ZipReader();
 		rewritesCount = 0;
-		for (Path resFile : inputPaths) {
-			LOG.info("Processing {}", resFile);
-			ResTableParser resTableParser = new ResTableParser(root, true);
+		for (Path resFile : inputResFiles) {
+			ResTableBinaryParser resTableParser = new ResTableBinaryParser(root, true);
 			if (resFile.getFileName().toString().endsWith(".jar")) {
 				// Load resources.arsc from android.jar
-				try (ZipFile zip = new ZipFile(resFile.toFile())) {
-					ZipEntry entry = zip.getEntry("resources.arsc");
+				try (ZipContent zip = zipReader.open(resFile.toFile())) {
+					IZipEntry entry = zip.searchEntry("resources.arsc");
 					if (entry == null) {
 						LOG.error("Failed to load \"resources.arsc\" from {}", resFile);
 						continue;
 					}
-					try (InputStream inputStream = zip.getInputStream(entry)) {
+					try (InputStream inputStream = entry.getInputStream()) {
 						resTableParser.decode(inputStream);
 					}
 				}
 			} else {
 				// Load resources.arsc from extracted file
-				try (InputStream inputStream = new BufferedInputStream(Files.newInputStream(resFile))) {
+				try (InputStream inputStream = Files.newInputStream(resFile)) {
 					resTableParser.decode(inputStream);
 				}
 			}
@@ -84,6 +87,16 @@ public class ConvertArscFile {
 		LOG.info("done");
 	}
 
+	private static List<Path> filterAndSort(List<Path> inputPaths) {
+		return inputPaths.stream()
+				.filter(p -> {
+					String fileName = p.getFileName().toString();
+					return fileName.endsWith(".arsc") || fileName.endsWith(".jar");
+				})
+				.sorted()
+				.collect(Collectors.toList());
+	}
+
 	private static void mergeResMaps(Map<Integer, String> mainResMap, Map<Integer, String> newResMap) {
 		for (Map.Entry<Integer, String> entry : newResMap.entrySet()) {
 			Integer id = entry.getKey();

jadx-cli/src/main/resources/logback.xml

@@ -1,3 +1,5 @@
+<!-- Jadx logger config. Used both in cli and gui -->
+
 <configuration>
 	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
 		<encoder>
@@ -5,6 +7,9 @@
 		</encoder>
 	</appender>
 
+	<!-- jadx-gui -->
+	<logger name="com.pinterest.ktlint" level="INFO"/>
+
 	<root level="INFO">
 		<appender-ref ref="STDOUT"/>
 	</root>

jadx-cli/src/test/java/jadx/cli/BaseCliIntegrationTest.java

@@ -0,0 +1,139 @@
+package jadx.cli;
+
+import java.io.IOException;
+import java.net.URISyntaxException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.LinkOption;
+import java.nio.file.Path;
+import java.nio.file.PathMatcher;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.io.TempDir;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.api.plugins.loader.JadxBasePluginLoader;
+import jadx.core.plugins.files.SingleDirFilesGetter;
+import jadx.core.utils.Utils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
+
+public class BaseCliIntegrationTest {
+	private static final Logger LOG = LoggerFactory.getLogger(BaseCliIntegrationTest.class);
+
+	static final PathMatcher LOG_ALL_FILES = path -> {
+		LOG.debug("File in result dir: {}", path);
+		return true;
+	};
+
+	@TempDir
+	Path testDir;
+
+	Path outputDir;
+
+	@BeforeEach
+	public void setUp() {
+		outputDir = testDir.resolve("output");
+	}
+
+	int execJadxCli(String sampleName, String... options) {
+		return execJadxCli(buildArgs(List.of(options), sampleName));
+	}
+
+	int execJadxCli(String[] args) {
+		return JadxCLI.execute(args, jadxArgs -> {
+			// don't use global config and plugins
+			jadxArgs.setFilesGetter(new SingleDirFilesGetter(testDir));
+			jadxArgs.setPluginLoader(new JadxBasePluginLoader());
+		});
+	}
+
+	String[] buildArgs(List<String> options, String... inputSamples) {
+		List<String> args = new ArrayList<>(options);
+		args.add("-v");
+		args.add("-d");
+		args.add(outputDir.toAbsolutePath().toString());
+
+		for (String inputSample : inputSamples) {
+			try {
+				URL resource = getClass().getClassLoader().getResource(inputSample);
+				assertThat(resource).isNotNull();
+				String sampleFile = resource.toURI().getRawPath();
+				args.add(sampleFile);
+			} catch (URISyntaxException e) {
+				fail("Failed to load sample: " + inputSample, e);
+			}
+		}
+		return args.toArray(new String[0]);
+	}
+
+	void decompile(String... inputSamples) throws IOException {
+		int result = execJadxCli(buildArgs(List.of(), inputSamples));
+		assertThat(result).isEqualTo(0);
+		List<Path> resultJavaFiles = collectJavaFilesInDir(outputDir);
+		assertThat(resultJavaFiles).isNotEmpty();
+
+		// do not copy input files as resources
+		for (Path path : collectFilesInDir(outputDir, LOG_ALL_FILES)) {
+			for (String inputSample : inputSamples) {
+				assertThat(path.toAbsolutePath().toString()).doesNotContain(inputSample);
+			}
+		}
+	}
+
+	static void printFiles(List<Path> files) {
+		LOG.info("Output files (count: {}):", files.size());
+		for (Path file : files) {
+			LOG.info(" {}", file);
+		}
+		LOG.info("");
+	}
+
+	String pathToUniformString(Path path) {
+		return path.toString().replace('\\', '/');
+	}
+
+	Path printFileContent(Path file) {
+		try {
+			String content = Files.readString(outputDir.resolve(file));
+			String spacer = Utils.strRepeat("=", 70);
+			LOG.info("File content: {}\n{}\n{}\n{}", file, spacer, content, spacer);
+			return file;
+		} catch (IOException e) {
+			throw new RuntimeException("Failed to load file: " + file, e);
+		}
+	}
+
+	static List<Path> collectJavaFilesInDir(Path dir) throws IOException {
+		PathMatcher javaMatcher = dir.getFileSystem().getPathMatcher("glob:**.java");
+		return collectFilesInDir(dir, javaMatcher);
+	}
+
+	static List<Path> collectAllFilesInDir(Path dir) throws IOException {
+		try (Stream<Path> pathStream = Files.walk(dir)) {
+			List<Path> files = pathStream
+					.filter(Files::isRegularFile)
+					.map(dir::relativize)
+					.collect(Collectors.toList());
+			printFiles(files);
+			return files;
+		}
+	}
+
+	static List<Path> collectFilesInDir(Path dir, PathMatcher matcher) throws IOException {
+		try (Stream<Path> pathStream = Files.walk(dir)) {
+			List<Path> files = pathStream
+					.filter(p -> Files.isRegularFile(p, LinkOption.NOFOLLOW_LINKS))
+					.filter(matcher::matches)
+					.collect(Collectors.toList());
+			printFiles(files);
+			return files;
+		}
+	}
+}

jadx-cli/src/test/java/jadx/cli/JadxCLIArgsTest.java

@@ -1,11 +1,14 @@
 package jadx.cli;
 
+import java.util.Collections;
+import java.util.Map;
+
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.is;
+import static jadx.core.utils.Utils.newConstStringMap;
+import static org.assertj.core.api.Assertions.assertThat;
 
 public class JadxCLIArgsTest {
 
@@ -13,38 +16,72 @@ public class JadxCLIArgsTest {
 
 	@Test
 	public void testInvertedBooleanOption() {
-		assertThat(parse("--no-replace-consts").isReplaceConsts(), is(false));
-		assertThat(parse("").isReplaceConsts(), is(true));
+		assertThat(parse("--no-replace-consts").isReplaceConsts()).isFalse();
+		assertThat(parse("").isReplaceConsts()).isTrue();
 	}
 
 	@Test
 	public void testEscapeUnicodeOption() {
-		assertThat(parse("--escape-unicode").isEscapeUnicode(), is(true));
-		assertThat(parse("").isEscapeUnicode(), is(false));
+		assertThat(parse("--escape-unicode").isEscapeUnicode()).isTrue();
+		assertThat(parse("").isEscapeUnicode()).isFalse();
 	}
 
 	@Test
 	public void testSrcOption() {
-		assertThat(parse("--no-src").isSkipSources(), is(true));
-		assertThat(parse("-s").isSkipSources(), is(true));
-		assertThat(parse("").isSkipSources(), is(false));
+		assertThat(parse("--no-src").isSkipSources()).isTrue();
+		assertThat(parse("-s").isSkipSources()).isTrue();
+		assertThat(parse("").isSkipSources()).isFalse();
 	}
 
 	@Test
 	public void testOptionsOverride() {
-		assertThat(override(new JadxCLIArgs(), "--no-imports").isUseImports(), is(false));
-		assertThat(override(new JadxCLIArgs(), "--no-debug-info").isDebugInfo(), is(false));
-		assertThat(override(new JadxCLIArgs(), "").isUseImports(), is(true));
+		assertThat(override(new JadxCLIArgs(), "--no-imports").isUseImports()).isFalse();
+		assertThat(override(new JadxCLIArgs(), "--no-debug-info").isDebugInfo()).isFalse();
+		assertThat(override(new JadxCLIArgs(), "").isUseImports()).isTrue();
 
 		JadxCLIArgs args = new JadxCLIArgs();
 		args.useImports = false;
-		assertThat(override(args, "--no-imports").isUseImports(), is(false));
+		assertThat(override(args, "--no-imports").isUseImports()).isFalse();
 		args.debugInfo = false;
-		assertThat(override(args, "--no-debug-info").isDebugInfo(), is(false));
+		assertThat(override(args, "--no-debug-info").isDebugInfo()).isFalse();
 
 		args = new JadxCLIArgs();
 		args.useImports = false;
-		assertThat(override(args, "").isUseImports(), is(false));
+		assertThat(override(args, "").isUseImports()).isFalse();
+	}
+
+	@Test
+	public void testPluginOptionsOverride() {
+		// add key to empty base map
+		checkPluginOptionsMerge(
+				Collections.emptyMap(),
+				"-Poption=otherValue",
+				newConstStringMap("option", "otherValue"));
+
+		// override one key
+		checkPluginOptionsMerge(
+				newConstStringMap("option", "value"),
+				"-Poption=otherValue",
+				newConstStringMap("option", "otherValue"));
+
+		// merge different keys
+		checkPluginOptionsMerge(
+				Collections.singletonMap("option1", "value1"),
+				"-Poption2=otherValue2",
+				newConstStringMap("option1", "value1", "option2", "otherValue2"));
+
+		// merge and override
+		checkPluginOptionsMerge(
+				newConstStringMap("option1", "value1", "option2", "value2"),
+				"-Poption2=otherValue2",
+				newConstStringMap("option1", "value1", "option2", "otherValue2"));
+	}
+
+	private void checkPluginOptionsMerge(Map<String, String> baseMap, String providedArgs, Map<String, String> expectedMap) {
+		JadxCLIArgs args = new JadxCLIArgs();
+		args.pluginOptions = baseMap;
+		Map<String, String> resultMap = override(args, providedArgs).getPluginOptions();
+		assertThat(resultMap).isEqualTo(expectedMap);
 	}
 
 	private JadxCLIArgs parse(String... args) {
@@ -52,15 +89,24 @@ public class JadxCLIArgsTest {
 	}
 
 	private JadxCLIArgs parse(JadxCLIArgs jadxArgs, String... args) {
-		boolean res = jadxArgs.processArgs(args);
-		assertThat(res, is(true));
-		LOG.info("Jadx args: {}", jadxArgs.toJadxArgs());
-		return jadxArgs;
+		return check(jadxArgs, jadxArgs.processArgs(args));
 	}
 
 	private JadxCLIArgs override(JadxCLIArgs jadxArgs, String... args) {
-		boolean res = jadxArgs.overrideProvided(args);
-		assertThat(res, is(true));
+		return check(jadxArgs, overrideProvided(jadxArgs, args));
+	}
+
+	private static boolean overrideProvided(JadxCLIArgs jadxArgs, String[] args) {
+		JCommanderWrapper jcw = new JCommanderWrapper(new JadxCLIArgs());
+		if (!jcw.parse(args)) {
+			return false;
+		}
+		jcw.overrideProvided(jadxArgs);
+		return jadxArgs.process(jcw);
+	}
+
+	private static JadxCLIArgs check(JadxCLIArgs jadxArgs, boolean res) {
+		assertThat(res).isTrue();
 		LOG.info("Jadx args: {}", jadxArgs.toJadxArgs());
 		return jadxArgs;
 	}

jadx-cli/src/test/java/jadx/cli/RenameConverterTest.java

@@ -7,10 +7,10 @@ import org.junit.jupiter.api.Test;
 
 import jadx.api.JadxArgs.RenameEnum;
 import jadx.cli.JadxCLIArgs.RenameConverter;
+import jadx.core.utils.exceptions.JadxArgsValidateException;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class RenameConverterTest {
 
@@ -24,25 +24,24 @@ public class RenameConverterTest {
 	@Test
 	public void all() {
 		Set<RenameEnum> set = converter.convert("all");
-		assertEquals(3, set.size());
-		assertTrue(set.contains(RenameEnum.CASE));
-		assertTrue(set.contains(RenameEnum.VALID));
-		assertTrue(set.contains(RenameEnum.PRINTABLE));
+		assertThat(set).hasSize(3);
+		assertThat(set).contains(RenameEnum.CASE);
+		assertThat(set).contains(RenameEnum.VALID);
+		assertThat(set).contains(RenameEnum.PRINTABLE);
 	}
 
 	@Test
 	public void none() {
 		Set<RenameEnum> set = converter.convert("none");
-		assertTrue(set.isEmpty());
+		assertThat(set).isEmpty();
 	}
 
 	@Test
 	public void wrong() {
-		IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class,
+		JadxArgsValidateException thrown = assertThrows(JadxArgsValidateException.class,
 				() -> converter.convert("wrong"),
 				"Expected convert() to throw, but it didn't");
 
-		assertEquals("'wrong' is unknown for parameter someParam, possible values are case, valid, printable",
-				thrown.getMessage());
+		assertThat(thrown.getMessage()).isEqualTo("'wrong' is unknown for parameter someParam, possible values are case, valid, printable");
 	}
 }

jadx-cli/src/test/java/jadx/cli/TestExport.java

@@ -0,0 +1,77 @@
+package jadx.cli;
+
+import org.assertj.core.api.Condition;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+public class TestExport extends BaseCliIntegrationTest {
+
+	@Test
+	public void testBasicExport() throws Exception {
+		int result = execJadxCli("samples/small.apk");
+		assertThat(result).isEqualTo(0);
+		assertThat(collectAllFilesInDir(outputDir))
+				.map(this::pathToUniformString)
+				.haveExactly(2, new Condition<>(f -> f.startsWith("sources/") && f.endsWith(".java"), "sources"))
+				.haveExactly(10, new Condition<>(f -> f.startsWith("resources/"), "resources"))
+				.haveExactly(1, new Condition<>(f -> f.equals("resources/AndroidManifest.xml"), "manifest"))
+				.hasSize(12);
+	}
+
+	@Test
+	public void testGradleExportApk() throws Exception {
+		int result = execJadxCli("samples/small.apk", "--export-gradle");
+		assertThat(result).isEqualTo(0);
+		assertThat(collectAllFilesInDir(outputDir))
+				.describedAs("check output files")
+				.map(this::pathToUniformString)
+				.haveExactly(2, new Condition<>(f -> f.endsWith(".java"), "java classes"))
+				.haveExactly(0, new Condition<>(f -> f.endsWith("classes.dex"), "dex files"))
+				.hasSize(15);
+	}
+
+	@Test
+	public void testGradleExportAAR() throws Exception {
+		int result = execJadxCli("samples/test-lib.aar", "--export-gradle");
+		assertThat(result).isEqualTo(0);
+		assertThat(collectAllFilesInDir(outputDir))
+				.describedAs("check output files")
+				.map(this::printFileContent)
+				.map(this::pathToUniformString)
+				.haveExactly(1, new Condition<>(f -> f.startsWith("lib/src/main/java/") && f.endsWith(".java"), "java"))
+				.haveExactly(0, new Condition<>(f -> f.endsWith(".jar"), "jar files"))
+				.hasSize(8);
+	}
+
+	@Test
+	public void testGradleExportSimpleJava() throws Exception {
+		int result = execJadxCli("samples/HelloWorld.class", "--export-gradle");
+		assertThat(result).isEqualTo(0);
+		assertThat(collectAllFilesInDir(outputDir))
+				.describedAs("check output files")
+				.map(this::printFileContent)
+				.map(this::pathToUniformString)
+				.haveExactly(1, new Condition<>(f -> f.endsWith(".java") && f.startsWith("app/src/main/java/"), "java"))
+				.haveExactly(0, new Condition<>(f -> f.endsWith(".class"), "class files"))
+				.haveExactly(1, new Condition<>(f -> f.equals("settings.gradle.kts"), "settings"))
+				.haveExactly(1, new Condition<>(f -> f.equals("app/build.gradle.kts"), "build"))
+				.hasSize(3);
+	}
+
+	@Test
+	public void testGradleExportInvalidType() throws Exception {
+		int result = execJadxCli("samples/HelloWorld.class", "--export-gradle-type", "android-app");
+		assertThat(result).isEqualTo(0);
+		// expect output in 'android-app' template, but most fields will be set to UNKNOWN.
+		assertThat(collectAllFilesInDir(outputDir))
+				.describedAs("check output files")
+				.map(this::printFileContent)
+				.map(this::pathToUniformString)
+				.haveExactly(1, new Condition<>(f -> f.endsWith(".java") && f.startsWith("app/src/main/java/"), "java"))
+				.haveExactly(1, new Condition<>(f -> f.equals("settings.gradle"), "settings"))
+				.haveExactly(1, new Condition<>(f -> f.equals("build.gradle"), "build"))
+				.haveExactly(1, new Condition<>(f -> f.equals("app/build.gradle"), "app build"))
+				.hasSize(4);
+	}
+}

jadx-cli/src/test/java/jadx/cli/TestInput.java

@@ -1,96 +1,76 @@
 package jadx.cli;
 
-import java.io.IOException;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.LinkOption;
 import java.nio.file.Path;
-import java.nio.file.PathMatcher;
-import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
-import org.junit.jupiter.api.AfterAll;
+import org.assertj.core.api.Condition;
 import org.junit.jupiter.api.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import jadx.core.utils.files.FileUtils;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestInput {
-	private static final Logger LOG = LoggerFactory.getLogger(TestInput.class);
+public class TestInput extends BaseCliIntegrationTest {
+
+	@Test
+	public void testHelp() {
+		int result = execJadxCli(new String[] { "--help" });
+		assertThat(result).isEqualTo(0);
+	}
+
+	@Test
+	public void testApkInput() throws Exception {
+		int result = execJadxCli(buildArgs(List.of(), "samples/small.apk"));
+		assertThat(result).isEqualTo(0);
+		assertThat(collectAllFilesInDir(outputDir))
+				.describedAs("check output files")
+				.map(p -> p.getFileName().toString())
+				.haveExactly(2, new Condition<>(f -> f.endsWith(".java"), "java classes"))
+				.haveExactly(9, new Condition<>(f -> f.endsWith(".xml"), "xml resources"))
+				.haveExactly(1, new Condition<>(f -> f.equals("AndroidManifest.xml"), "manifest"))
+				.hasSize(12);
+	}
 
 	@Test
 	public void testDexInput() throws Exception {
-		decompile("dex", "samples/hello.dex");
+		decompile("samples/hello.dex");
 	}
 
 	@Test
 	public void testSmaliInput() throws Exception {
-		decompile("smali", "samples/HelloWorld.smali");
+		decompile("samples/HelloWorld.smali");
 	}
 
 	@Test
 	public void testClassInput() throws Exception {
-		decompile("class", "samples/HelloWorld.class");
+		decompile("samples/HelloWorld.class");
 	}
 
 	@Test
 	public void testMultipleInput() throws Exception {
-		decompile("multi", "samples/hello.dex", "samples/HelloWorld.smali");
+		decompile("samples/hello.dex", "samples/HelloWorld.smali");
 	}
 
-	private void decompile(String tmpDirName, String... inputSamples) throws URISyntaxException, IOException {
-		List<String> args = new ArrayList<>();
-		Path tempDir = FileUtils.createTempDir(tmpDirName);
-		args.add("-v");
-		args.add("-d");
-		args.add(tempDir.toAbsolutePath().toString());
-
-		for (String inputSample : inputSamples) {
-			URL resource = getClass().getClassLoader().getResource(inputSample);
-			assertThat(resource).isNotNull();
-			String sampleFile = resource.toURI().getRawPath();
-			args.add(sampleFile);
-		}
-
-		int result = JadxCLI.execute(args.toArray(new String[0]));
+	@Test
+	public void testFallbackMode() throws Exception {
+		int result = execJadxCli(buildArgs(List.of("-f"), "samples/hello.dex"));
 		assertThat(result).isEqualTo(0);
-		List<Path> resultJavaFiles = collectJavaFilesInDir(tempDir);
-		assertThat(resultJavaFiles).isNotEmpty();
-
-		// do not copy input files as resources
-		PathMatcher logAllFiles = path -> {
-			LOG.debug("File in result dir: {}", path);
-			return true;
-		};
-		for (Path path : collectFilesInDir(tempDir, logAllFiles)) {
-			for (String inputSample : inputSamples) {
-				assertThat(path.toAbsolutePath().toString()).doesNotContain(inputSample);
-			}
-		}
+		List<Path> files = collectJavaFilesInDir(outputDir);
+		assertThat(files).hasSize(1);
 	}
 
-	private static List<Path> collectJavaFilesInDir(Path dir) throws IOException {
-		PathMatcher javaMatcher = dir.getFileSystem().getPathMatcher("glob:**.java");
-		return collectFilesInDir(dir, javaMatcher);
+	@Test
+	public void testSimpleMode() throws Exception {
+		int result = execJadxCli(buildArgs(List.of("--decompilation-mode", "simple"), "samples/hello.dex"));
+		assertThat(result).isEqualTo(0);
+		List<Path> files = collectJavaFilesInDir(outputDir);
+		assertThat(files).hasSize(1);
 	}
 
-	private static List<Path> collectFilesInDir(Path dir, PathMatcher matcher) throws IOException {
-		try (Stream<Path> pathStream = Files.walk(dir)) {
-			return pathStream
-					.filter(p -> Files.isRegularFile(p, LinkOption.NOFOLLOW_LINKS))
-					.filter(matcher::matches)
-					.collect(Collectors.toList());
-		}
-	}
-
-	@AfterAll
-	public static void cleanup() {
-		FileUtils.clearTempRootDir();
+	@Test
+	public void testResourceOnly() throws Exception {
+		int result = execJadxCli(buildArgs(List.of(), "samples/resources-only.apk"));
+		assertThat(result).isEqualTo(0);
+		List<Path> files = collectFilesInDir(outputDir,
+				path -> path.getFileName().toString().equalsIgnoreCase("AndroidManifest.xml"));
+		assertThat(files).isNotEmpty();
 	}
 }

jadx-cli/src/test/java/jadx/plugins/tools/utils/PluginUtilsTest.java

@@ -0,0 +1,17 @@
+package jadx.plugins.tools.utils;
+
+import org.junit.jupiter.api.Test;
+
+import static jadx.plugins.tools.utils.PluginUtils.extractVersion;
+import static org.assertj.core.api.Assertions.assertThat;
+
+class PluginUtilsTest {
+
+	@Test
+	public void testExtractVersion() {
+		assertThat(extractVersion("plugin-name-v1.2.3.jar")).isEqualTo("1.2.3");
+		assertThat(extractVersion("plugin-name-v1.2.jar")).isEqualTo("1.2");
+		assertThat(extractVersion("1.2.3.jar")).isEqualTo("1.2.3");
+	}
+
+}

jadx-commons/jadx-app-commons/README.md

@@ -0,0 +1,6 @@
+## jadx app commons
+
+This module contains common utilities used in jadx apps (cli and gui) and not needed in jadx-code module:
+- `JadxCommonFiles` - wrapper for `dev.dirs:directories` lib to get
+  'config' and 'cache' directories in cross-platform way
+- `JadxCommonEnv` - utils for work with environment variables

jadx-commons/jadx-app-commons/build.gradle.kts

@@ -0,0 +1,7 @@
+plugins {
+	id("jadx-library")
+}
+
+dependencies {
+	implementation("io.get-coursier.util:directories-jni:0.1.4")
+}

jadx-commons/jadx-app-commons/src/main/java/jadx/commons/app/JadxCommonEnv.java

@@ -0,0 +1,29 @@
+package jadx.commons.app;
+
+public class JadxCommonEnv {
+
+	public static String get(String varName, String defValue) {
+		String strValue = System.getenv(varName);
+		return isNullOrEmpty(strValue) ? defValue : strValue;
+	}
+
+	public static boolean getBool(String varName, boolean defValue) {
+		String strValue = System.getenv(varName);
+		if (isNullOrEmpty(strValue)) {
+			return defValue;
+		}
+		return strValue.equalsIgnoreCase("true");
+	}
+
+	public static int getInt(String varName, int defValue) {
+		String strValue = System.getenv(varName);
+		if (isNullOrEmpty(strValue)) {
+			return defValue;
+		}
+		return Integer.parseInt(strValue);
+	}
+
+	private static boolean isNullOrEmpty(String value) {
+		return value == null || value.isEmpty();
+	}
+}

jadx-commons/jadx-app-commons/src/main/java/jadx/commons/app/JadxCommonFiles.java

@@ -0,0 +1,105 @@
+package jadx.commons.app;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.function.Function;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import dev.dirs.ProjectDirectories;
+import dev.dirs.impl.Windows;
+import dev.dirs.impl.WindowsPowerShell;
+import dev.dirs.jni.WindowsJni;
+
+public class JadxCommonFiles {
+	private static final Logger LOG = LoggerFactory.getLogger(JadxCommonFiles.class);
+
+	private static final Path CONFIG_DIR;
+	private static final Path CACHE_DIR;
+
+	public static Path getConfigDir() {
+		return CONFIG_DIR;
+	}
+
+	public static Path getCacheDir() {
+		return CACHE_DIR;
+	}
+
+	static {
+		DirsLoader loader = new DirsLoader();
+		loader.init();
+		CONFIG_DIR = loader.getConfigDir();
+		CACHE_DIR = loader.getCacheDir();
+	}
+
+	private static final class DirsLoader {
+		private @Nullable ProjectDirectories dirs;
+		private Path configDir;
+		private Path cacheDir;
+
+		public void init() {
+			try {
+				configDir = loadEnvDir("JADX_CONFIG_DIR", pd -> pd.configDir);
+				cacheDir = loadEnvDir("JADX_CACHE_DIR", pd -> pd.cacheDir);
+			} catch (Exception e) {
+				throw new RuntimeException("Failed to init common directories", e);
+			}
+		}
+
+		private Path loadEnvDir(String envVar, Function<ProjectDirectories, String> dirFunc) throws IOException {
+			String envDir = JadxCommonEnv.get(envVar, null);
+			String dirStr;
+			if (envDir != null) {
+				dirStr = envDir;
+			} else {
+				dirStr = dirFunc.apply(loadDirs());
+			}
+			Path path = Path.of(dirStr).toAbsolutePath();
+			Files.createDirectories(path);
+			return path;
+		}
+
+		private synchronized ProjectDirectories loadDirs() {
+			ProjectDirectories currentDirs = dirs;
+			if (currentDirs != null) {
+				return currentDirs;
+			}
+			LOG.debug("Loading system dirs ...");
+			long start = System.currentTimeMillis();
+
+			ProjectDirectories loadedDirs = ProjectDirectories.from("io.github", "skylot", "jadx", DirsLoader::getWinDirs);
+
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("Loaded system dirs ({}ms): config: {}, cache: {}",
+						System.currentTimeMillis() - start, loadedDirs.configDir, loadedDirs.cacheDir);
+			}
+			dirs = loadedDirs;
+			return loadedDirs;
+		}
+
+		/**
+		 * Return JNI, Foreign or PowerShell implementation
+		 */
+		private static Windows getWinDirs() {
+			Windows defSup = Windows.getDefaultSupplier().get();
+			if (defSup instanceof WindowsPowerShell) {
+				if (JadxSystemInfo.IS_AMD64) {
+					// JNI library compiled for x86-64
+					return new WindowsJni();
+				}
+			}
+			return defSup;
+		}
+
+		public Path getCacheDir() {
+			return cacheDir;
+		}
+
+		public Path getConfigDir() {
+			return configDir;
+		}
+	}
+}

jadx-commons/jadx-app-commons/src/main/java/jadx/commons/app/JadxSystemInfo.java

@@ -0,0 +1,25 @@
+package jadx.commons.app;
+
+import java.util.Locale;
+
+public class JadxSystemInfo {
+	public static final String JAVA_VM = System.getProperty("java.vm.name", "?");
+	public static final String JAVA_VER = System.getProperty("java.version", "?");
+
+	public static final String OS_NAME = System.getProperty("os.name", "?");
+	public static final String OS_ARCH = System.getProperty("os.arch", "?");
+	public static final String OS_VERSION = System.getProperty("os.version", "?");
+
+	private static final String OS_NAME_LOWER = OS_NAME.toLowerCase(Locale.ENGLISH);
+	public static final boolean IS_WINDOWS = OS_NAME_LOWER.startsWith("windows");
+	public static final boolean IS_MAC = OS_NAME_LOWER.startsWith("mac");
+	public static final boolean IS_LINUX = !IS_WINDOWS && !IS_MAC;
+	public static final boolean IS_UNIX = !IS_WINDOWS;
+
+	private static final String OS_ARCH_LOWER = OS_NAME.toLowerCase(Locale.ENGLISH);
+	public static final boolean IS_AMD64 = OS_ARCH_LOWER.equals("amd64");
+	public static final boolean IS_ARM64 = OS_ARCH_LOWER.equals("aarch64");
+
+	private JadxSystemInfo() {
+	}
+}

jadx-commons/jadx-app-commons/src/main/java/jadx/commons/app/JadxTempFiles.java

@@ -0,0 +1,33 @@
+package jadx.commons.app;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+public class JadxTempFiles {
+	private static final String JADX_TMP_INSTANCE_PREFIX = "jadx-instance-";
+
+	private static final Path TEMP_ROOT_DIR = createTempRootDir();
+
+	public static Path getTempRootDir() {
+		return TEMP_ROOT_DIR;
+	}
+
+	private static Path createTempRootDir() {
+		try {
+			String jadxTmpDir = System.getenv("JADX_TMP_DIR");
+			Path dir;
+			if (jadxTmpDir != null) {
+				Path customTmpRootDir = Paths.get(jadxTmpDir);
+				Files.createDirectories(customTmpRootDir);
+				dir = Files.createTempDirectory(customTmpRootDir, JADX_TMP_INSTANCE_PREFIX);
+			} else {
+				dir = Files.createTempDirectory(JADX_TMP_INSTANCE_PREFIX);
+			}
+			dir.toFile().deleteOnExit();
+			return dir;
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to create temp root directory", e);
+		}
+	}
+}

jadx-commons/jadx-zip/README.md

@@ -0,0 +1,3 @@
+## jadx zip
+
+Custom zip reader implementation to fight tampering and provide additional security checks

jadx-commons/jadx-zip/build.gradle.kts

@@ -0,0 +1,3 @@
+plugins {
+	id("jadx-library")
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/IZipEntry.java

@@ -0,0 +1,36 @@
+package jadx.zip;
+
+import java.io.File;
+import java.io.InputStream;
+
+public interface IZipEntry {
+
+	/**
+	 * Zip entry name
+	 */
+	String getName();
+
+	/**
+	 * Uncompressed bytes
+	 */
+	byte[] getBytes();
+
+	/**
+	 * Stream of uncompressed bytes.
+	 */
+	InputStream getInputStream();
+
+	long getCompressedSize();
+
+	long getUncompressedSize();
+
+	boolean isDirectory();
+
+	File getZipFile();
+
+	/**
+	 * Return true if {@link #getBytes()} method is more optimal to use other than
+	 * {@link #getInputStream()}
+	 */
+	boolean preferBytes();
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/IZipParser.java

@@ -0,0 +1,9 @@
+package jadx.zip;
+
+import java.io.Closeable;
+import java.io.IOException;
+
+public interface IZipParser extends Closeable {
+
+	ZipContent open() throws IOException;
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/ZipContent.java

@@ -0,0 +1,50 @@
+package jadx.zip;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ZipContent implements Closeable {
+	private static final Logger LOG = LoggerFactory.getLogger(ZipContent.class);
+
+	private final IZipParser zipParser;
+	private final List<IZipEntry> entries;
+	private final Map<String, IZipEntry> entriesMap;
+
+	public ZipContent(IZipParser zipParser, List<IZipEntry> entries) {
+		this.zipParser = zipParser;
+		this.entries = entries;
+		this.entriesMap = buildNameMap(zipParser, entries);
+	}
+
+	private static Map<String, IZipEntry> buildNameMap(IZipParser zipParser, List<IZipEntry> entries) {
+		Map<String, IZipEntry> map = new HashMap<>(entries.size());
+		for (IZipEntry entry : entries) {
+			String name = entry.getName();
+			IZipEntry prevEntry = map.put(name, entry);
+			if (prevEntry != null) {
+				LOG.warn("Found duplicate entry: {} in {}", name, zipParser);
+			}
+		}
+		return map;
+	}
+
+	public List<IZipEntry> getEntries() {
+		return entries;
+	}
+
+	public @Nullable IZipEntry searchEntry(String fileName) {
+		return entriesMap.get(fileName);
+	}
+
+	@Override
+	public void close() throws IOException {
+		zipParser.close();
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/ZipReader.java

@@ -0,0 +1,111 @@
+package jadx.zip;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Set;
+import java.util.function.BiConsumer;
+import java.util.function.Function;
+
+import org.jetbrains.annotations.Nullable;
+
+import jadx.zip.fallback.FallbackZipParser;
+import jadx.zip.parser.JadxZipParser;
+import jadx.zip.security.IJadxZipSecurity;
+import jadx.zip.security.JadxZipSecurity;
+
+/**
+ * Jadx wrapper to provide custom zip parser ({@link JadxZipParser})
+ * with fallback to default Java implementation.
+ */
+public class ZipReader {
+	private final ZipReaderOptions options;
+
+	public ZipReader() {
+		this(ZipReaderOptions.getDefault());
+	}
+
+	public ZipReader(Set<ZipReaderFlags> flags) {
+		this(new ZipReaderOptions(new JadxZipSecurity(), flags));
+	}
+
+	public ZipReader(IJadxZipSecurity security) {
+		this(new ZipReaderOptions(security, ZipReaderFlags.none()));
+	}
+
+	public ZipReader(ZipReaderOptions options) {
+		this.options = options;
+	}
+
+	@SuppressWarnings("resource")
+	public ZipContent open(File zipFile) throws IOException {
+		try {
+			JadxZipParser jadxParser = new JadxZipParser(zipFile, options);
+			IZipParser detectedParser = detectParser(zipFile, jadxParser);
+			if (detectedParser != jadxParser) {
+				jadxParser.close();
+			}
+			return detectedParser.open();
+		} catch (Exception e) {
+			if (options.getFlags().contains(ZipReaderFlags.DONT_USE_FALLBACK)) {
+				throw new IOException("Failed to open zip: " + zipFile, e);
+			}
+			// switch to fallback parser
+			return buildFallbackParser(zipFile).open();
+		}
+	}
+
+	/**
+	 * Visit valid entries in a zip file.
+	 * Return not null value from visitor to stop iteration.
+	 */
+	public <R> @Nullable R visitEntries(File file, Function<IZipEntry, R> visitor) {
+		try (ZipContent content = open(file)) {
+			for (IZipEntry entry : content.getEntries()) {
+				R result = visitor.apply(entry);
+				if (result != null) {
+					return result;
+				}
+			}
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to process zip file: " + file.getAbsolutePath(), e);
+		}
+		return null;
+	}
+
+	public void readEntries(File file, BiConsumer<IZipEntry, InputStream> visitor) {
+		visitEntries(file, entry -> {
+			if (!entry.isDirectory()) {
+				try (InputStream in = entry.getInputStream()) {
+					visitor.accept(entry, in);
+				} catch (Exception e) {
+					throw new RuntimeException("Failed to process zip entry: " + entry, e);
+				}
+			}
+			return null;
+		});
+	}
+
+	public ZipReaderOptions getOptions() {
+		return options;
+	}
+
+	private IZipParser detectParser(File zipFile, JadxZipParser jadxParser) {
+		if (zipFile.getName().endsWith(".apk")
+				|| options.getFlags().contains(ZipReaderFlags.DONT_USE_FALLBACK)) {
+			return jadxParser;
+		}
+		if (!jadxParser.canOpen()) {
+			return buildFallbackParser(zipFile);
+		}
+		// default
+		if (options.getFlags().contains(ZipReaderFlags.FALLBACK_AS_DEFAULT)) {
+			return buildFallbackParser(zipFile);
+		}
+		return jadxParser;
+	}
+
+	private FallbackZipParser buildFallbackParser(File zipFile) {
+		return new FallbackZipParser(zipFile, options);
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/ZipReaderFlags.java

@@ -0,0 +1,32 @@
+package jadx.zip;
+
+import java.util.EnumSet;
+import java.util.Set;
+
+public enum ZipReaderFlags {
+	/**
+	 * Search all local file headers by signature without reading
+	 * 'central directory' and 'end of central directory' entries
+	 */
+	IGNORE_CENTRAL_DIR_ENTRIES,
+
+	/**
+	 * Enable additional checks to verify zip data and report possible tampering
+	 */
+	REPORT_TAMPERING,
+
+	/**
+	 * Use fallback (java built-in implementation) parser as default.
+	 * Custom implementation will be used for '*.apk' files only.
+	 */
+	FALLBACK_AS_DEFAULT,
+
+	/**
+	 * Use only jadx custom parser and do not switch to fallback on errors.
+	 */
+	DONT_USE_FALLBACK;
+
+	public static Set<ZipReaderFlags> none() {
+		return EnumSet.noneOf(ZipReaderFlags.class);
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/ZipReaderOptions.java

@@ -0,0 +1,29 @@
+package jadx.zip;
+
+import java.util.Set;
+
+import jadx.zip.security.IJadxZipSecurity;
+import jadx.zip.security.JadxZipSecurity;
+
+public class ZipReaderOptions {
+
+	public static ZipReaderOptions getDefault() {
+		return new ZipReaderOptions(new JadxZipSecurity(), ZipReaderFlags.none());
+	}
+
+	private final IJadxZipSecurity zipSecurity;
+	private final Set<ZipReaderFlags> flags;
+
+	public ZipReaderOptions(IJadxZipSecurity zipSecurity, Set<ZipReaderFlags> flags) {
+		this.zipSecurity = zipSecurity;
+		this.flags = flags;
+	}
+
+	public IJadxZipSecurity getZipSecurity() {
+		return zipSecurity;
+	}
+
+	public Set<ZipReaderFlags> getFlags() {
+		return flags;
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/fallback/FallbackZipEntry.java

@@ -0,0 +1,61 @@
+package jadx.zip.fallback;
+
+import java.io.File;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+
+import jadx.zip.IZipEntry;
+
+public class FallbackZipEntry implements IZipEntry {
+	private final FallbackZipParser parser;
+	private final ZipEntry zipEntry;
+
+	public FallbackZipEntry(FallbackZipParser parser, ZipEntry zipEntry) {
+		this.parser = parser;
+		this.zipEntry = zipEntry;
+	}
+
+	public ZipEntry getZipEntry() {
+		return zipEntry;
+	}
+
+	@Override
+	public String getName() {
+		return zipEntry.getName();
+	}
+
+	@Override
+	public boolean preferBytes() {
+		return false;
+	}
+
+	@Override
+	public byte[] getBytes() {
+		return parser.getBytes(this);
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		return parser.getInputStream(this);
+	}
+
+	@Override
+	public long getCompressedSize() {
+		return zipEntry.getCompressedSize();
+	}
+
+	@Override
+	public long getUncompressedSize() {
+		return zipEntry.getSize();
+	}
+
+	@Override
+	public boolean isDirectory() {
+		return zipEntry.isDirectory();
+	}
+
+	@Override
+	public File getZipFile() {
+		return parser.getZipFile();
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/fallback/FallbackZipParser.java

@@ -0,0 +1,109 @@
+package jadx.zip.fallback;
+
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.zip.IZipEntry;
+import jadx.zip.IZipParser;
+import jadx.zip.ZipContent;
+import jadx.zip.ZipReaderOptions;
+import jadx.zip.io.LimitedInputStream;
+import jadx.zip.security.IJadxZipSecurity;
+
+public class FallbackZipParser implements IZipParser {
+	private static final Logger LOG = LoggerFactory.getLogger(FallbackZipParser.class);
+	private final File file;
+	private final IJadxZipSecurity zipSecurity;
+	private final boolean useLimitedDataStream;
+
+	private ZipFile zipFile;
+
+	public FallbackZipParser(File file, ZipReaderOptions options) {
+		this.file = file;
+		this.zipSecurity = options.getZipSecurity();
+		this.useLimitedDataStream = zipSecurity.useLimitedDataStream();
+	}
+
+	@Override
+	public ZipContent open() throws IOException {
+		zipFile = new ZipFile(file);
+
+		int maxEntriesCount = zipSecurity.getMaxEntriesCount();
+		if (maxEntriesCount == -1) {
+			maxEntriesCount = Integer.MAX_VALUE;
+		}
+
+		List<IZipEntry> list = new ArrayList<>();
+		Enumeration<? extends ZipEntry> entries = zipFile.entries();
+		while (entries.hasMoreElements()) {
+			FallbackZipEntry zipEntry = new FallbackZipEntry(this, entries.nextElement());
+			if (isValidEntry(zipEntry)) {
+				list.add(zipEntry);
+				if (list.size() > maxEntriesCount) {
+					throw new IllegalStateException("Max entries count limit exceeded: " + list.size());
+				}
+			}
+		}
+		return new ZipContent(this, list);
+	}
+
+	private boolean isValidEntry(IZipEntry zipEntry) {
+		boolean validEntry = zipSecurity.isValidEntry(zipEntry);
+		if (!validEntry) {
+			LOG.warn("Zip entry '{}' is invalid and excluded from processing", zipEntry);
+		}
+		return validEntry;
+	}
+
+	public byte[] getBytes(FallbackZipEntry entry) {
+		try (InputStream is = getEntryStream(entry)) {
+			return is.readAllBytes();
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to read bytes for entry: " + entry.getName(), e);
+		}
+	}
+
+	public InputStream getInputStream(FallbackZipEntry entry) {
+		try {
+			return getEntryStream(entry);
+		} catch (Exception e) {
+			throw new RuntimeException("Failed to open input stream for entry: " + entry.getName(), e);
+		}
+	}
+
+	private InputStream getEntryStream(FallbackZipEntry entry) throws IOException {
+		InputStream entryStream = zipFile.getInputStream(entry.getZipEntry());
+		InputStream stream;
+		if (useLimitedDataStream) {
+			stream = new LimitedInputStream(entryStream, entry.getUncompressedSize());
+		} else {
+			stream = entryStream;
+		}
+		return new BufferedInputStream(stream);
+	}
+
+	public File getZipFile() {
+		return file;
+	}
+
+	@Override
+	public void close() throws IOException {
+		try {
+			if (zipFile != null) {
+				zipFile.close();
+			}
+		} finally {
+			zipFile = null;
+		}
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/io/ByteBufferBackedInputStream.java

@@ -0,0 +1,46 @@
+package jadx.zip.io;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
+public class ByteBufferBackedInputStream extends InputStream {
+	private final ByteBuffer buf;
+	private int markedPosition = 0;
+
+	public ByteBufferBackedInputStream(ByteBuffer buf) {
+		this.buf = buf;
+	}
+
+	public int read() throws IOException {
+		if (!buf.hasRemaining()) {
+			return -1;
+		}
+		return buf.get() & 0xFF;
+	}
+
+	@SuppressWarnings("NullableProblems")
+	public int read(byte[] bytes, int off, int len) throws IOException {
+		if (!buf.hasRemaining()) {
+			return -1;
+		}
+		int readLen = Math.min(len, buf.remaining());
+		buf.get(bytes, off, readLen);
+		return readLen;
+	}
+
+	@Override
+	public boolean markSupported() {
+		return true;
+	}
+
+	@Override
+	public synchronized void mark(int unused) {
+		markedPosition = buf.position();
+	}
+
+	@Override
+	public synchronized void reset() {
+		buf.position(markedPosition);
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/io/LimitedInputStream.java

@@ -1,21 +1,22 @@
-package jadx.api.plugins.utils;
+package jadx.zip.io;
 
 import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
 public class LimitedInputStream extends FilterInputStream {
-
 	private final long maxSize;
 
 	private long currentPos;
+	private long markPos;
 
-	protected LimitedInputStream(InputStream in, long maxSize) {
+	public LimitedInputStream(InputStream in, long maxSize) {
 		super(in);
 		this.maxSize = maxSize;
 	}
 
-	private void checkPos() {
+	private void addAndCheckPos(long count) {
+		currentPos += count;
 		if (currentPos > maxSize) {
 			throw new IllegalStateException("Read limit exceeded");
 		}
@@ -25,18 +26,17 @@ public class LimitedInputStream extends FilterInputStream {
 	public int read() throws IOException {
 		int data = super.read();
 		if (data != -1) {
-			currentPos++;
-			checkPos();
+			addAndCheckPos(1);
 		}
 		return data;
 	}
 
+	@SuppressWarnings("NullableProblems")
 	@Override
 	public int read(byte[] b, int off, int len) throws IOException {
 		int count = super.read(b, off, len);
 		if (count > 0) {
-			currentPos += count;
-			checkPos();
+			addAndCheckPos(count);
 		}
 		return count;
 	}
@@ -44,10 +44,21 @@ public class LimitedInputStream extends FilterInputStream {
 	@Override
 	public long skip(long n) throws IOException {
 		long skipped = super.skip(n);
-		if (skipped != 0) {
-			currentPos += skipped;
-			checkPos();
+		if (skipped > 0) {
+			addAndCheckPos(skipped);
 		}
 		return skipped;
 	}
+
+	@Override
+	public void mark(int readLimit) {
+		super.mark(readLimit);
+		markPos = currentPos;
+	}
+
+	@Override
+	public void reset() throws IOException {
+		super.reset();
+		currentPos = markPos;
+	}
 }

jadx-commons/jadx-zip/src/main/java/jadx/zip/parser/JadxZipEntry.java

@@ -0,0 +1,93 @@
+package jadx.zip.parser;
+
+import java.io.File;
+import java.io.InputStream;
+
+import jadx.zip.IZipEntry;
+
+public final class JadxZipEntry implements IZipEntry {
+	private final JadxZipParser parser;
+	private final String fileName;
+	private final int compressMethod;
+	private final int entryStart;
+	private final int dataStart;
+	private final long compressedSize;
+	private final long uncompressedSize;
+
+	JadxZipEntry(JadxZipParser parser, String fileName, int entryStart, int dataStart,
+			int compressMethod, long compressedSize, long uncompressedSize) {
+		this.parser = parser;
+		this.fileName = fileName;
+		this.entryStart = entryStart;
+		this.dataStart = dataStart;
+		this.compressMethod = compressMethod;
+		this.compressedSize = compressedSize;
+		this.uncompressedSize = uncompressedSize;
+	}
+
+	public boolean isSizesValid() {
+		if (compressedSize <= 0) {
+			return false;
+		}
+		if (uncompressedSize <= 0) {
+			return false;
+		}
+		return compressedSize <= uncompressedSize;
+	}
+
+	public String getName() {
+		return fileName;
+	}
+
+	@Override
+	public long getCompressedSize() {
+		return compressedSize;
+	}
+
+	@Override
+	public long getUncompressedSize() {
+		return uncompressedSize;
+	}
+
+	@Override
+	public boolean isDirectory() {
+		return fileName.endsWith("/");
+	}
+
+	@Override
+	public boolean preferBytes() {
+		return true;
+	}
+
+	@Override
+	public byte[] getBytes() {
+		return parser.getBytes(this);
+	}
+
+	@Override
+	public InputStream getInputStream() {
+		return parser.getInputStream(this);
+	}
+
+	public int getEntryStart() {
+		return entryStart;
+	}
+
+	public int getDataStart() {
+		return dataStart;
+	}
+
+	public int getCompressMethod() {
+		return compressMethod;
+	}
+
+	@Override
+	public File getZipFile() {
+		return parser.getZipFile();
+	}
+
+	@Override
+	public String toString() {
+		return parser.getZipFile().getName() + ':' + fileName;
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/parser/JadxZipParser.java

@@ -0,0 +1,439 @@
+package jadx.zip.parser;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.RandomAccessFile;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.channels.FileChannel;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.jetbrains.annotations.Nullable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.zip.IZipEntry;
+import jadx.zip.IZipParser;
+import jadx.zip.ZipContent;
+import jadx.zip.ZipReaderFlags;
+import jadx.zip.ZipReaderOptions;
+import jadx.zip.fallback.FallbackZipParser;
+import jadx.zip.io.ByteBufferBackedInputStream;
+import jadx.zip.io.LimitedInputStream;
+import jadx.zip.security.IJadxZipSecurity;
+
+/**
+ * Custom and simple zip parser to fight tampering.
+ * Many zip features aren't supported:
+ * - Compression methods other than STORE or DEFLATE
+ * - Zip64
+ * - Checksum verification
+ * - Multi file archives
+ */
+public final class JadxZipParser implements IZipParser {
+	private static final Logger LOG = LoggerFactory.getLogger(JadxZipParser.class);
+
+	private static final byte LOCAL_FILE_HEADER_START = 0x50;
+	private static final int LOCAL_FILE_HEADER_SIGN = 0x04034b50;
+	private static final int CD_SIGN = 0x02014b50;
+	private static final int END_OF_CD_SIGN = 0x06054b50;
+
+	private final File zipFile;
+	private final ZipReaderOptions options;
+	private final IJadxZipSecurity zipSecurity;
+	private final Set<ZipReaderFlags> flags;
+	private final boolean verify;
+	private final boolean useLimitedDataStream;
+
+	private RandomAccessFile file;
+	private FileChannel fileChannel;
+	private ByteBuffer byteBuffer;
+
+	private int endOfCDStart = -2;
+
+	private @Nullable ZipContent fallbackZipContent;
+
+	public JadxZipParser(File zipFile, ZipReaderOptions options) {
+		this.zipFile = zipFile;
+		this.options = options;
+		this.zipSecurity = options.getZipSecurity();
+		this.flags = options.getFlags();
+		this.verify = options.getFlags().contains(ZipReaderFlags.REPORT_TAMPERING);
+		this.useLimitedDataStream = zipSecurity.useLimitedDataStream();
+	}
+
+	@Override
+	public ZipContent open() throws IOException {
+		load();
+		try {
+			int maxEntriesCount = zipSecurity.getMaxEntriesCount();
+			if (maxEntriesCount == -1) {
+				maxEntriesCount = Integer.MAX_VALUE;
+			}
+			List<IZipEntry> entries;
+			if (flags.contains(ZipReaderFlags.IGNORE_CENTRAL_DIR_ENTRIES)) {
+				entries = searchLocalFileHeaders(maxEntriesCount);
+			} else {
+				entries = loadFromCentralDirs(maxEntriesCount);
+			}
+			return new ZipContent(this, entries);
+		} catch (Exception e) {
+			if (flags.contains(ZipReaderFlags.DONT_USE_FALLBACK)) {
+				throw new IOException("Failed to open zip: " + zipFile + ", error: " + e.getMessage(), e);
+			}
+			LOG.warn("Zip open failed, switching to fallback parser, zip: {}", zipFile, e);
+			return initFallbackParser();
+		}
+	}
+
+	@SuppressWarnings("RedundantIfStatement")
+	public boolean canOpen() {
+		try {
+			load();
+			int eocdStart = searchEndOfCDStart();
+			ByteBuffer buf = byteBuffer;
+			buf.position(eocdStart + 4);
+			int diskNum = readU2(buf);
+			if (diskNum == 0xFFFF) {
+				// Zip64
+				return false;
+			}
+			return true;
+		} catch (Exception e) {
+			LOG.warn("Jadx parser can't open zip file: {}", zipFile, e);
+			return false;
+		}
+	}
+
+	private boolean isValidEntry(JadxZipEntry zipEntry) {
+		boolean validEntry = zipSecurity.isValidEntry(zipEntry);
+		if (!validEntry) {
+			LOG.warn("Zip entry '{}' is invalid and excluded from processing", zipEntry);
+		}
+		return validEntry;
+	}
+
+	private void load() throws IOException {
+		if (byteBuffer != null) {
+			// already loaded
+			return;
+		}
+		file = new RandomAccessFile(zipFile, "r");
+		long size = file.length();
+		if (size >= Integer.MAX_VALUE) {
+			throw new IOException("Zip file is too big");
+		}
+		int fileLen = (int) size;
+		if (fileLen < 100 * 1024 * 1024) {
+			// load files smaller than 100MB directly into memory
+			byte[] bytes = new byte[fileLen];
+			file.readFully(bytes);
+			byteBuffer = ByteBuffer.wrap(bytes).asReadOnlyBuffer();
+			file.close();
+			file = null;
+		} else {
+			// for big files - use a memory mapped file
+			fileChannel = file.getChannel();
+			byteBuffer = fileChannel.map(FileChannel.MapMode.READ_ONLY, 0, fileChannel.size());
+		}
+		byteBuffer.order(ByteOrder.LITTLE_ENDIAN);
+	}
+
+	private List<IZipEntry> searchLocalFileHeaders(int maxEntriesCount) {
+		List<IZipEntry> entries = new ArrayList<>();
+		while (true) {
+			int start = searchEntryStart();
+			if (start == -1) {
+				return entries;
+			}
+			JadxZipEntry zipEntry = loadFileEntry(start);
+			if (isValidEntry(zipEntry)) {
+				entries.add(zipEntry);
+				if (entries.size() > maxEntriesCount) {
+					throw new IllegalStateException("Max entries count limit exceeded: " + entries.size());
+				}
+			}
+		}
+	}
+
+	private List<IZipEntry> loadFromCentralDirs(int maxEntriesCount) throws IOException {
+		int eocdStart = searchEndOfCDStart();
+		if (eocdStart < 0) {
+			throw new RuntimeException("End of central directory not found");
+		}
+		ByteBuffer buf = byteBuffer;
+		buf.position(eocdStart + 10);
+		int entriesCount = readU2(buf);
+		buf.position(eocdStart + 16);
+		int cdOffset = buf.getInt();
+
+		if (entriesCount > maxEntriesCount) {
+			throw new IllegalStateException("Max entries count limit exceeded: " + entriesCount);
+		}
+		List<IZipEntry> entries = new ArrayList<>(entriesCount);
+		buf.position(cdOffset);
+		for (int i = 0; i < entriesCount; i++) {
+			JadxZipEntry zipEntry = loadCDEntry();
+			if (isValidEntry(zipEntry)) {
+				entries.add(zipEntry);
+			}
+		}
+		return entries;
+	}
+
+	private JadxZipEntry loadCDEntry() {
+		ByteBuffer buf = byteBuffer;
+		int start = buf.position();
+		buf.position(start + 28);
+		int fileNameLen = readU2(buf);
+		int extraFieldLen = readU2(buf);
+		int commentLen = readU2(buf);
+		buf.position(start + 42);
+		int fileEntryStart = buf.getInt();
+		int entryEnd = start + 46 + fileNameLen + extraFieldLen + commentLen;
+		JadxZipEntry entry = loadFileEntry(fileEntryStart);
+		if (verify) {
+			compareCDAndLFH(buf, start, entry);
+		}
+		if (!entry.isSizesValid()) {
+			entry = fixEntryFromCD(entry, start);
+		}
+		buf.position(entryEnd);
+		return entry;
+	}
+
+	private JadxZipEntry fixEntryFromCD(JadxZipEntry entry, int start) {
+		ByteBuffer buf = byteBuffer;
+		buf.position(start + 10);
+		int comprMethod = readU2(buf);
+		buf.position(start + 20);
+		int comprSize = buf.getInt();
+		int unComprSize = buf.getInt();
+		return new JadxZipEntry(this, entry.getName(), start, entry.getDataStart(), comprMethod, comprSize, unComprSize);
+	}
+
+	private static void compareCDAndLFH(ByteBuffer buf, int start, JadxZipEntry entry) {
+		buf.position(start + 10);
+		int comprMethod = readU2(buf);
+		if (comprMethod != entry.getCompressMethod()) {
+			LOG.warn("Compression method differ in CD {} and LFH {} for {}",
+					comprMethod, entry.getCompressMethod(), entry);
+		}
+		buf.position(start + 20);
+		int comprSize = buf.getInt();
+		int unComprSize = buf.getInt();
+		if (comprSize != entry.getCompressedSize()) {
+			LOG.warn("Compressed size differ in CD {} and LFH {} for {}",
+					comprSize, entry.getCompressedSize(), entry);
+		}
+		if (unComprSize != entry.getUncompressedSize()) {
+			LOG.warn("Uncompressed size differ in CD {} and LFH {} for {}",
+					unComprSize, entry.getUncompressedSize(), entry);
+		}
+	}
+
+	private JadxZipEntry loadFileEntry(int start) {
+		ByteBuffer buf = byteBuffer;
+		buf.position(start + 8);
+		int comprMethod = readU2(buf);
+		buf.position(start + 18);
+		int comprSize = buf.getInt();
+		int unComprSize = buf.getInt();
+		int fileNameLen = readU2(buf);
+		int extraFieldLen = readU2(buf);
+		String fileName = readString(buf, fileNameLen);
+		int dataStart = start + 30 + fileNameLen + extraFieldLen;
+		buf.position(dataStart + comprSize);
+		return new JadxZipEntry(this, fileName, start, dataStart, comprMethod, comprSize, unComprSize);
+	}
+
+	private int searchEndOfCDStart() throws IOException {
+		if (endOfCDStart != -2) {
+			return endOfCDStart;
+		}
+		ByteBuffer buf = byteBuffer;
+		int pos = buf.limit() - 22;
+		int minPos = Math.max(0, pos - 0xffff);
+		while (true) {
+			buf.position(pos);
+			int sign = buf.getInt();
+			if (sign == END_OF_CD_SIGN) {
+				endOfCDStart = pos;
+				return pos;
+			}
+			pos--;
+			if (pos < minPos) {
+				throw new IOException("End of central directory record not found");
+			}
+		}
+	}
+
+	private int searchEntryStart() {
+		ByteBuffer buf = byteBuffer;
+		while (true) {
+			int start = buf.position();
+			if (start + 4 > buf.limit()) {
+				return -1;
+			}
+			byte b = buf.get();
+			if (b == LOCAL_FILE_HEADER_START) {
+				buf.position(start);
+				int sign = buf.getInt();
+				if (sign == LOCAL_FILE_HEADER_SIGN) {
+					return start;
+				}
+			}
+		}
+	}
+
+	synchronized InputStream getInputStream(JadxZipEntry entry) {
+		if (verify) {
+			verifyEntry(entry);
+		}
+		InputStream stream;
+		if (entry.getCompressMethod() == 8) {
+			try {
+				stream = ZipDeflate.decompressEntryToStream(byteBuffer, entry);
+			} catch (Exception e) {
+				entryParseFailed(entry, e);
+				return useFallbackParser(entry).getInputStream();
+			}
+		} else {
+			// treat any other compression methods values as UNCOMPRESSED
+			stream = bufferToStream(byteBuffer, entry.getDataStart(), (int) entry.getUncompressedSize());
+		}
+		if (useLimitedDataStream) {
+			return new LimitedInputStream(stream, entry.getUncompressedSize());
+		}
+		return stream;
+	}
+
+	synchronized byte[] getBytes(JadxZipEntry entry) {
+		if (verify) {
+			verifyEntry(entry);
+		}
+		if (entry.getCompressMethod() == 8) {
+			try {
+				return ZipDeflate.decompressEntryToBytes(byteBuffer, entry);
+			} catch (Exception e) {
+				entryParseFailed(entry, e);
+				return useFallbackParser(entry).getBytes();
+			}
+		}
+		// treat any other compression methods values as UNCOMPRESSED
+		return bufferToBytes(byteBuffer, entry.getDataStart(), (int) entry.getUncompressedSize());
+	}
+
+	private static void verifyEntry(JadxZipEntry entry) {
+		int compressMethod = entry.getCompressMethod();
+		if (compressMethod == 0) {
+			if (entry.getCompressedSize() != entry.getUncompressedSize()) {
+				LOG.warn("Not equal sizes for STORE method: compressed: {}, uncompressed: {}, entry: {}",
+						entry.getCompressedSize(), entry.getUncompressedSize(), entry);
+			}
+		} else if (compressMethod != 8) {
+			LOG.warn("Unknown compress method: {} in entry: {}", compressMethod, entry);
+		}
+	}
+
+	private void entryParseFailed(JadxZipEntry entry, Exception e) {
+		if (isEncrypted(entry)) {
+			throw new RuntimeException("Entry is encrypted, failed to decompress: " + entry, e);
+		}
+		if (flags.contains(ZipReaderFlags.DONT_USE_FALLBACK)) {
+			throw new RuntimeException("Failed to decompress zip entry: " + entry + ", error: " + e.getMessage(), e);
+		}
+		LOG.warn("Entry '{}' parse failed, switching to fallback parser", entry, e);
+	}
+
+	@SuppressWarnings("resource")
+	private IZipEntry useFallbackParser(JadxZipEntry entry) {
+		LOG.debug("useFallbackParser used for {}", entry);
+		IZipEntry zipEntry = initFallbackParser().searchEntry(entry.getName());
+		if (zipEntry == null) {
+			throw new RuntimeException("Fallback parser can't find entry: " + entry);
+		}
+		return zipEntry;
+	}
+
+	@SuppressWarnings("resource")
+	private ZipContent initFallbackParser() {
+		if (fallbackZipContent == null) {
+			try {
+				fallbackZipContent = new FallbackZipParser(zipFile, options).open();
+			} catch (Exception e) {
+				throw new RuntimeException("Fallback parser failed to open file: " + zipFile, e);
+			}
+		}
+		return fallbackZipContent;
+	}
+
+	private boolean isEncrypted(JadxZipEntry entry) {
+		int flags = readFlags(entry);
+		return (flags & 1) != 0;
+	}
+
+	private int readFlags(JadxZipEntry entry) {
+		ByteBuffer buf = byteBuffer;
+		buf.position(entry.getEntryStart() + 6);
+		return readU2(buf);
+	}
+
+	static byte[] bufferToBytes(ByteBuffer buf, int start, int size) {
+		byte[] data = new byte[size];
+		buf.position(start);
+		buf.get(data);
+		return data;
+	}
+
+	static InputStream bufferToStream(ByteBuffer buf, int start, int size) {
+		buf.position(start);
+		ByteBuffer streamBuf = buf.slice();
+		streamBuf.limit(size);
+		return new ByteBufferBackedInputStream(streamBuf);
+	}
+
+	private static int readU2(ByteBuffer buf) {
+		return buf.getShort() & 0xFFFF;
+	}
+
+	private static String readString(ByteBuffer buf, int fileNameLen) {
+		byte[] bytes = new byte[fileNameLen];
+		buf.get(bytes);
+		return new String(bytes, StandardCharsets.UTF_8);
+	}
+
+	@Override
+	public void close() throws IOException {
+		try {
+			if (fileChannel != null) {
+				fileChannel.close();
+			}
+			if (file != null) {
+				file.close();
+			}
+			if (fallbackZipContent != null) {
+				fallbackZipContent.close();
+			}
+		} finally {
+			fileChannel = null;
+			file = null;
+			byteBuffer = null;
+			endOfCDStart = -2;
+			fallbackZipContent = null;
+		}
+	}
+
+	public File getZipFile() {
+		return zipFile;
+	}
+
+	@Override
+	public String toString() {
+		return "JadxZipParser{" + zipFile + '}';
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/parser/ZipDeflate.java

@@ -0,0 +1,38 @@
+package jadx.zip.parser;
+
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+import java.util.zip.DataFormatException;
+import java.util.zip.Inflater;
+import java.util.zip.InflaterInputStream;
+
+import static jadx.zip.parser.JadxZipParser.bufferToStream;
+
+final class ZipDeflate {
+	private static final int BUFFER_SIZE = 4096;
+
+	static byte[] decompressEntryToBytes(ByteBuffer buf, JadxZipEntry entry) throws DataFormatException {
+		buf.position(entry.getDataStart());
+		ByteBuffer entryBuf = buf.slice();
+		entryBuf.limit((int) entry.getCompressedSize());
+		if (entry.getUncompressedSize() > Integer.MAX_VALUE) {
+			throw new DataFormatException("Entry too large: " + entry.getUncompressedSize());
+		}
+		byte[] out = new byte[(int) entry.getUncompressedSize()];
+		Inflater inflater = new Inflater(true);
+		inflater.setInput(entryBuf);
+		int written = inflater.inflate(out);
+		inflater.end();
+		if (written != out.length) {
+			throw new DataFormatException("Unexpected size of decompressed entry: " + entry
+					+ ", got: " + written + ", expected: " + out.length);
+		}
+		return out;
+	}
+
+	static InputStream decompressEntryToStream(ByteBuffer buf, JadxZipEntry entry) {
+		InputStream stream = bufferToStream(buf, entry.getDataStart(), (int) entry.getCompressedSize());
+		Inflater inflater = new Inflater(true);
+		return new InflaterInputStream(stream, inflater, BUFFER_SIZE);
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/security/DisabledZipSecurity.java

@@ -0,0 +1,35 @@
+package jadx.zip.security;
+
+import java.io.File;
+
+import jadx.zip.IZipEntry;
+
+public class DisabledZipSecurity implements IJadxZipSecurity {
+
+	public static final DisabledZipSecurity INSTANCE = new DisabledZipSecurity();
+
+	@Override
+	public boolean isValidEntry(IZipEntry entry) {
+		return true;
+	}
+
+	@Override
+	public boolean isValidEntryName(String entryName) {
+		return true;
+	}
+
+	@Override
+	public boolean isInSubDirectory(File baseDir, File file) {
+		return true;
+	}
+
+	@Override
+	public boolean useLimitedDataStream() {
+		return false;
+	}
+
+	@Override
+	public int getMaxEntriesCount() {
+		return -1;
+	}
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/security/IJadxZipSecurity.java

@@ -0,0 +1,35 @@
+package jadx.zip.security;
+
+import java.io.File;
+
+import jadx.zip.IZipEntry;
+
+public interface IJadxZipSecurity {
+
+	/**
+	 * Check if zip entry is valid and safe to process
+	 */
+	boolean isValidEntry(IZipEntry entry);
+
+	/**
+	 * Check if the zip entry name is valid.
+	 * This check should be part of {@link #isValidEntry(IZipEntry)} method.
+	 */
+	boolean isValidEntryName(String entryName);
+
+	/**
+	 * Use limited InputStream for entry uncompressed data
+	 */
+	boolean useLimitedDataStream();
+
+	/**
+	 * Max entries count expected in a zip file, fail zip open if the limit exceeds.
+	 * Return -1 to disable entries count check.
+	 */
+	int getMaxEntriesCount();
+
+	/**
+	 * Check if a file will be inside baseDir after a system resolves its path
+	 */
+	boolean isInSubDirectory(File baseDir, File file);
+}

jadx-commons/jadx-zip/src/main/java/jadx/zip/security/JadxZipSecurity.java

@@ -0,0 +1,129 @@
+package jadx.zip.security;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import jadx.zip.IZipEntry;
+
+public class JadxZipSecurity implements IJadxZipSecurity {
+	private static final Logger LOG = LoggerFactory.getLogger(JadxZipSecurity.class);
+
+	private static final Path CWD = Paths.get(".").toAbsolutePath().normalize();
+
+	/**
+	 * The size of uncompressed zip entry shouldn't be bigger of compressed in zipBombDetectionFactor
+	 * times
+	 */
+	private int zipBombDetectionFactor = 100;
+
+	/**
+	 * Zip entries that have an uncompressed size of less than zipBombMinUncompressedSize are considered
+	 * safe
+	 */
+	private int zipBombMinUncompressedSize = 25 * 1024 * 1024;
+
+	private int maxEntriesCount = 100_000;
+
+	private boolean useLimitedDataStream = true;
+
+	@Override
+	public boolean isValidEntry(IZipEntry entry) {
+		return isValidEntryName(entry.getName()) && !isZipBomb(entry);
+	}
+
+	@Override
+	public boolean useLimitedDataStream() {
+		return useLimitedDataStream;
+	}
+
+	@Override
+	public int getMaxEntriesCount() {
+		return maxEntriesCount;
+	}
+
+	/**
+	 * Checks that entry name contains no any traversals and prevents cases like "../classes.dex",
+	 * to limit output only to the specified directory
+	 */
+	@Override
+	public boolean isValidEntryName(String entryName) {
+		if (entryName.contains("..")) { // quick pre-check
+			if (entryName.contains("../") || entryName.contains("..\\")) {
+				LOG.error("Path traversal attack detected in entry: '{}'", entryName);
+				return false;
+			}
+		}
+		// Path traversal check as presented on
+		// https://www.heise.de/en/background/Secure-Coding-Best-practices-for-using-Java-NIO-against-path-traversal-9996787.html
+		try {
+			Path entryPath = CWD.resolve(entryName).normalize();
+			if (entryPath.startsWith(CWD)) {
+				return true;
+			}
+		} catch (Exception e) {
+			// check failed
+			LOG.error("Invalid file name or path traversal attack detected: {} - error: {}", entryName, e.getMessage());
+			return false;
+		}
+		LOG.error("Invalid file name or path traversal attack detected: {}", entryName);
+		return false;
+	}
+
+	@Override
+	public boolean isInSubDirectory(File baseDir, File file) {
+		try {
+			return isInSubDirectoryInternal(baseDir.getCanonicalFile(), file.getCanonicalFile());
+		} catch (IOException e) {
+			return false;
+		}
+	}
+
+	public boolean isZipBomb(IZipEntry entry) {
+		long compressedSize = entry.getCompressedSize();
+		long uncompressedSize = entry.getUncompressedSize();
+		boolean invalidSize = compressedSize < 0 || uncompressedSize < 0;
+		boolean possibleZipBomb = uncompressedSize >= zipBombMinUncompressedSize
+				&& compressedSize * zipBombDetectionFactor < uncompressedSize;
+		if (invalidSize || possibleZipBomb) {
+			LOG.error("Potential zip bomb attack detected, invalid sizes: compressed {}, uncompressed {}, name {}",
+					compressedSize, uncompressedSize, entry.getName());
+			return true;
+		}
+		return false;
+	}
+
+	private static boolean isInSubDirectoryInternal(File baseDir, File file) {
+		File current = file;
+		while (true) {
+			if (current == null) {
+				return false;
+			}
+			if (current.equals(baseDir)) {
+				return true;
+			}
+			current = current.getParentFile();
+		}
+	}
+
+	public void setMaxEntriesCount(int maxEntriesCount) {
+		this.maxEntriesCount = maxEntriesCount;
+	}
+
+	public void setZipBombDetectionFactor(int zipBombDetectionFactor) {
+		this.zipBombDetectionFactor = zipBombDetectionFactor;
+	}
+
+	public void setZipBombMinUncompressedSize(int zipBombMinUncompressedSize) {
+		this.zipBombMinUncompressedSize = zipBombMinUncompressedSize;
+	}
+
+	public void setUseLimitedDataStream(boolean useLimitedDataStream) {
+		this.useLimitedDataStream = useLimitedDataStream;
+	}
+
+}

jadx-core/build.gradle

@@ -1,28 +0,0 @@
-plugins {
-	id 'jadx-library'
-}
-
-dependencies {
-	api(project(':jadx-plugins:jadx-plugins-api'))
-
-	implementation 'com.google.code.gson:gson:2.9.0'
-	implementation 'com.android.tools.build:aapt2-proto:4.2.1-7147631'
-	constraints {
-		// Force protobuf version to prevent Java-7 issue
-		implementation 'com.google.protobuf:protobuf-java:3.11.4'
-	}
-
-	testImplementation 'org.apache.commons:commons-lang3:3.12.0'
-
-	testRuntimeOnly(project(':jadx-plugins:jadx-dex-input'))
-	testRuntimeOnly(project(':jadx-plugins:jadx-smali-input'))
-	testRuntimeOnly(project(':jadx-plugins:jadx-java-convert'))
-	testRuntimeOnly(project(':jadx-plugins:jadx-java-input'))
-	testRuntimeOnly(project(':jadx-plugins:jadx-raung-input'))
-
-	testImplementation('tools.profiler:async-profiler:1.8.3')
-}
-
-test {
-	exclude '**/tmp/*'
-}

jadx-core/build.gradle.kts

@@ -0,0 +1,55 @@
+plugins {
+	id("jadx-library")
+}
+
+dependencies {
+	api(project(":jadx-plugins:jadx-input-api"))
+	api(project(":jadx-commons:jadx-zip"))
+
+	implementation("com.google.code.gson:gson:2.13.2")
+
+	testImplementation("org.apache.commons:commons-lang3:3.20.0")
+
+	testImplementation(project(":jadx-plugins:jadx-dex-input"))
+	testRuntimeOnly(project(":jadx-plugins:jadx-smali-input"))
+	testRuntimeOnly(project(":jadx-plugins:jadx-java-convert"))
+	testRuntimeOnly(project(":jadx-plugins:jadx-java-input"))
+	testRuntimeOnly(project(":jadx-plugins:jadx-raung-input"))
+
+	testImplementation("org.eclipse.jdt:ecj") {
+		version {
+			prefer("3.33.0")
+			strictly("[3.33, 3.34[") // from 3.34 compiled with Java 17
+		}
+	}
+	testImplementation("tools.profiler:async-profiler:4.2")
+}
+
+val jadxTestJavaVersion = getTestJavaVersion()
+
+fun getTestJavaVersion(): Int? {
+	val envVarName = "JADX_TEST_JAVA_VERSION"
+	val testJavaVer = System.getenv(envVarName)?.toInt() ?: return null
+	val currentJavaVer = java.toolchain.languageVersion.get().asInt()
+	if (testJavaVer < currentJavaVer) {
+		throw GradleException("'$envVarName' can't be set to lower version than $currentJavaVer")
+	}
+	println("Set Java toolchain for core tests to version '$testJavaVer'")
+	return testJavaVer
+}
+
+tasks.named<Test>("test") {
+	jadxTestJavaVersion?.let { testJavaVer ->
+		javaLauncher =
+			javaToolchains.launcherFor {
+				languageVersion = JavaLanguageVersion.of(testJavaVer)
+			}
+	}
+
+	// disable cache to allow test's rerun,
+	// because most tests are integration and depends on plugins and environment
+	outputs.cacheIf { false }
+
+	// exclude temp tests
+	exclude("**/tmp/*")
+}

jadx-core/src/main/java/jadx/api/CodePosition.java

@@ -1,65 +0,0 @@
-package jadx.api;
-
-public final class CodePosition {
-
-	private final int line;
-	private final int offset;
-	private final int pos;
-
-	public CodePosition(int line, int offset, int pos) {
-		this.line = line;
-		this.offset = offset;
-		this.pos = pos;
-	}
-
-	public CodePosition(int line) {
-		this(line, 0, -1);
-	}
-
-	@Deprecated
-	public CodePosition(int line, int offset) {
-		this(line, offset, -1);
-	}
-
-	public int getPos() {
-		return pos;
-	}
-
-	public int getLine() {
-		return line;
-	}
-
-	public int getOffset() {
-		return offset;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CodePosition that = (CodePosition) o;
-		return line == that.line && offset == that.offset;
-	}
-
-	@Override
-	public int hashCode() {
-		return line + 31 * offset;
-	}
-
-	@Override
-	public String toString() {
-		StringBuilder sb = new StringBuilder();
-		sb.append(line);
-		if (offset != 0) {
-			sb.append(':').append(offset);
-		}
-		if (pos > 0) {
-			sb.append('@').append(pos);
-		}
-		return sb.toString();
-	}
-}

jadx-core/src/main/java/jadx/api/DecompilationMode.java

@@ -0,0 +1,36 @@
+package jadx.api;
+
+public enum DecompilationMode {
+	/**
+	 * Trying best options (default)
+	 */
+	AUTO,
+
+	/**
+	 * Restore code structure (normal java code)
+	 */
+	RESTRUCTURE,
+
+	/**
+	 * Simplified instructions (linear with goto's)
+	 */
+	SIMPLE,
+
+	/**
+	 * Raw instructions without modifications
+	 */
+	FALLBACK;
+
+	public boolean isSpecial() {
+		switch (this) {
+			case AUTO:
+			case RESTRUCTURE:
+				return false;
+			case SIMPLE:
+			case FALLBACK:
+				return true;
+			default:
+				throw new RuntimeException("Unexpected decompilation mode: " + this);
+		}
+	}
+}

jadx-core/src/main/java/jadx/api/ICodeCache.java

@@ -1,13 +1,21 @@
 package jadx.api;
 
+import java.io.Closeable;
+
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public interface ICodeCache {
+public interface ICodeCache extends Closeable {
 
 	void add(String clsFullName, ICodeInfo codeInfo);
 
 	void remove(String clsFullName);
 
-	@Nullable
+	@NotNull
 	ICodeInfo get(String clsFullName);
+
+	@Nullable
+	String getCode(String clsFullName);
+
+	boolean contains(String clsFullName);
 }

jadx-core/src/main/java/jadx/api/ICodeInfo.java

@@ -1,8 +1,7 @@
 package jadx.api;
 
-import java.util.Map;
-
 import jadx.api.impl.SimpleCodeInfo;
+import jadx.api.metadata.ICodeMetadata;
 
 public interface ICodeInfo {
 
@@ -10,7 +9,7 @@ public interface ICodeInfo {
 
 	String getCodeStr();
 
-	Map<Integer, Integer> getLineMapping();
+	ICodeMetadata getCodeMetadata();
 
-	Map<CodePosition, Object> getAnnotations();
+	boolean hasMetadata();
 }