Magic-Mirror/jadx
1
0
Fork 0
mirror of https://github.com/skylot/jadx.git synced 2024-11-22 20:29:51 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore: update dependencies

Browse Source
This commit is contained in:
Skylot 2024-11-10 19:15:03 +00:00
parent dd86abcc5e
commit e644bad758
No known key found for this signature in database
GPG Key ID: 47A4975761262B6A
8 changed files with 41 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/jadx-java.gradle.kts
View File

@ -17,10 +17,10 @@ dependencies {
implementation("org.slf4j:slf4j-api:2.0.16")
compileOnly("org.jetbrains:annotations:26.0.1")
testImplementation("ch.qos.logback:logback-classic:1.5.11")
testImplementation("ch.qos.logback:logback-classic:1.5.12")
testImplementation("org.assertj:assertj-core:3.26.3")
testImplementation("org.junit.jupiter:junit-jupiter:5.11.2")
testImplementation("org.junit.jupiter:junit-jupiter:5.11.3")
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
testCompileOnly("org.jetbrains:annotations:26.0.1")

8
buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts
View File

@ -9,10 +9,10 @@ repositories {
}
dependencies {
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:2.20.1")
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:2.15.0")
rewrite("org.openrewrite.recipe:rewrite-migrate-java:2.27.0")
rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.18.0")
rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:2.21.0")
rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:2.15.1")
rewrite("org.openrewrite.recipe:rewrite-migrate-java:2.28.0")
rewrite("org.openrewrite.recipe:rewrite-static-analysis:1.19.0")
}
tasks {

6
config/jflex/SmaliTokenMaker.flex
View File

@ -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; }
}

29
config/jflex/skeleton.default
View File

@ -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
}

4
jadx-cli/build.gradle.kts
View File

@ -4,7 +4,7 @@ plugins {
id("application")
// use shadow only for application scripts, jar will be copied from jadx-gui
id("com.gradleup.shadow") version "8.3.3"
id("com.gradleup.shadow") version "8.3.5"
}
dependencies {
@ -23,7 +23,7 @@ dependencies {
runtimeOnly(project(":jadx-plugins:jadx-aab-input"))
implementation("org.jcommander:jcommander:2.0")
implementation("ch.qos.logback:logback-classic:1.5.11")
implementation("ch.qos.logback:logback-classic:1.5.12")
}
application {

18
jadx-gui/build.gradle.kts
View File

@ -3,7 +3,7 @@ plugins {
id("application")
id("jadx-library")
id("edu.sc.seis.launch4j") version "3.0.6"
id("com.gradleup.shadow") version "8.3.3"
id("com.gradleup.shadow") version "8.3.5"
id("org.beryx.runtime") version "1.13.1"
}
@ -23,20 +23,20 @@ dependencies {
implementation("com.fifesoft:autocomplete:3.3.1")
// use KtLint for format and check jadx scripts
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.3.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.3.1")
implementation("com.pinterest.ktlint:ktlint-rule-engine:1.4.1")
implementation("com.pinterest.ktlint:ktlint-ruleset-standard:1.4.1")
implementation("org.jcommander:jcommander:2.0")
implementation("ch.qos.logback:logback-classic:1.5.11")
implementation("ch.qos.logback:logback-classic:1.5.12")
implementation("io.github.oshai:kotlin-logging-jvm:7.0.0")
implementation("com.fifesoft:rsyntaxtextarea:3.4.1")
implementation("com.fifesoft:rsyntaxtextarea:3.5.2")
implementation("org.drjekyll:fontchooser:3.1.0")
implementation("hu.kazocsaba:image-viewer:1.2.3")
implementation("com.formdev:flatlaf:3.5.1")
implementation("com.formdev:flatlaf-intellij-themes:3.5.1")
implementation("com.formdev:flatlaf-extras:3.5.1")
implementation("com.formdev:flatlaf:3.5.2")
implementation("com.formdev:flatlaf-intellij-themes:3.5.2")
implementation("com.formdev:flatlaf-extras:3.5.2")
implementation("com.google.code.gson:gson:2.11.0")
implementation("org.apache.commons:commons-lang3:3.17.0")
@ -45,7 +45,7 @@ dependencies {
implementation("io.reactivex.rxjava2:rxjava:2.2.21")
implementation("com.github.akarnokd:rxjava2-swing:0.3.7")
implementation("com.android.tools.build:apksig:8.7.1")
implementation("com.android.tools.build:apksig:8.7.2")
implementation("io.github.skylot:jdwp:2.0.0")
testImplementation(project(":jadx-core").dependencyProject.sourceSets.getByName("test").output)

4
jadx-gui/src/main/java/jadx/gui/ui/codearea/SmaliTokenMaker.java
View File

@ -1363,6 +1363,10 @@ public class SmaliTokenMaker extends AbstractJFlexCTokenMaker {
zzLexicalState = newState;
}
public final int yystate() {
return zzLexicalState;
}
/**
* Returns the text matched by the current regular expression.
*/

4
jadx-plugins/jadx-aab-input/build.gradle.kts
View File

@ -5,14 +5,14 @@ plugins {
dependencies {
compileOnly(project(":jadx-core"))
implementation("com.android.tools.build:aapt2-proto:8.7.1-12006047")
implementation("com.android.tools.build:aapt2-proto:8.7.2-12006047")
implementation("com.google.protobuf:protobuf-java") {
version {
require("3.25.3") // version 4 conflict with `aapt2-proto`
}
}
implementation("com.android.tools.build:bundletool:1.17.1") {
implementation("com.android.tools.build:bundletool:1.17.2") {
// All of this is unnecessary for parsing BundleConfig.pb except for protobuf
exclude(group = "com.android.tools.build")
exclude(group = "com.google.protobuf")