fix: use maven-publish for JitPack and other fixes (PR #1242)
* Update dependencies * Fix spaces in file paths * Update Gradle for LGTM * Update spotless * Fix Jitpack Co-authored-by: Skylot <skylot@gmail.com>
This commit is contained in:
+13
-4
@@ -1,6 +1,6 @@
|
||||
plugins {
|
||||
id 'com.github.ben-manes.versions' version '0.39.0'
|
||||
id "com.diffplug.spotless" version "5.12.5"
|
||||
id 'com.diffplug.spotless' version '5.14.3'
|
||||
}
|
||||
|
||||
ext.jadxVersion = System.getenv('JADX_VERSION') ?: "dev"
|
||||
@@ -10,6 +10,7 @@ println("jadx version: ${jadxVersion}")
|
||||
allprojects {
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'checkstyle'
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
version = jadxVersion
|
||||
|
||||
@@ -26,20 +27,28 @@ allprojects {
|
||||
}
|
||||
}
|
||||
|
||||
publishing {
|
||||
publications {
|
||||
mavenJava(MavenPublication) {
|
||||
from components.java
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation 'org.slf4j:slf4j-api:1.7.32'
|
||||
compileOnly 'org.jetbrains:annotations:21.0.1'
|
||||
compileOnly 'org.jetbrains:annotations:22.0.0'
|
||||
|
||||
testImplementation 'ch.qos.logback:logback-classic:1.2.5'
|
||||
testImplementation 'org.hamcrest:hamcrest-library:2.2'
|
||||
testImplementation 'org.mockito:mockito-core:3.11.2'
|
||||
testImplementation 'org.mockito:mockito-core:3.12.1'
|
||||
testImplementation 'org.assertj:assertj-core:3.20.2'
|
||||
|
||||
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.2'
|
||||
testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.2'
|
||||
|
||||
testImplementation 'org.eclipse.jdt.core.compiler:ecj:4.6.1'
|
||||
testCompileOnly 'org.jetbrains:annotations:21.0.1'
|
||||
testCompileOnly 'org.jetbrains:annotations:22.0.0'
|
||||
}
|
||||
|
||||
test {
|
||||
|
||||
@@ -7,6 +7,7 @@ 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;
|
||||
@@ -44,19 +45,20 @@ public class TestInput {
|
||||
}
|
||||
|
||||
private void decompile(String tmpDirName, String... inputSamples) throws URISyntaxException, IOException {
|
||||
StringBuilder args = new StringBuilder();
|
||||
List<String> args = new ArrayList<>();
|
||||
Path tempDir = FileUtils.createTempDir(tmpDirName);
|
||||
args.append("-v");
|
||||
args.append(" -d ").append(tempDir.toAbsolutePath());
|
||||
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.append(' ').append(sampleFile);
|
||||
args.add(sampleFile);
|
||||
}
|
||||
|
||||
int result = JadxCLI.execute(args.toString().split(" "));
|
||||
int result = JadxCLI.execute(args.toArray(new String[0]));
|
||||
assertThat(result).isEqualTo(0);
|
||||
List<Path> resultJavaFiles = collectJavaFilesInDir(tempDir);
|
||||
assertThat(resultJavaFiles).isNotEmpty();
|
||||
|
||||
@@ -5,7 +5,7 @@ plugins {
|
||||
dependencies {
|
||||
api(project(':jadx-plugins:jadx-plugins-api'))
|
||||
|
||||
implementation 'com.google.code.gson:gson:2.8.7'
|
||||
implementation 'com.google.code.gson:gson:2.8.8'
|
||||
implementation 'com.android.tools.build:aapt2-proto:4.2.1-7147631'
|
||||
|
||||
testImplementation 'org.apache.commons:commons-lang3:3.12.0'
|
||||
|
||||
@@ -15,13 +15,13 @@ dependencies {
|
||||
implementation files('libs/jfontchooser-1.0.5.jar')
|
||||
implementation 'hu.kazocsaba:image-viewer:1.2.3'
|
||||
|
||||
implementation 'com.formdev:flatlaf:1.4'
|
||||
implementation 'com.formdev:flatlaf-intellij-themes:1.4'
|
||||
implementation 'com.formdev:flatlaf-extras:1.4'
|
||||
implementation 'com.formdev:flatlaf:1.5'
|
||||
implementation 'com.formdev:flatlaf-intellij-themes:1.5'
|
||||
implementation 'com.formdev:flatlaf-extras:1.5'
|
||||
implementation 'com.formdev:svgSalamander:1.1.2.4'
|
||||
implementation 'org.reflections:reflections:0.9.12'
|
||||
|
||||
implementation 'com.google.code.gson:gson:2.8.6'
|
||||
implementation 'com.google.code.gson:gson:2.8.8'
|
||||
implementation 'org.apache.commons:commons-lang3:3.12.0'
|
||||
implementation 'org.apache.commons:commons-text:1.9'
|
||||
|
||||
|
||||
Reference in New Issue
Block a user