Commit 727285e3 authored by Skylot's avatar Skylot

chore: update dependencies and gradle

parent a932c7c5
plugins { plugins {
id 'com.github.ksoichiro.console.reporter' version '0.5.0' id 'org.sonarqube' version '2.7'
id 'org.sonarqube' version '2.6.2'
id 'com.github.ben-manes.versions' version '0.20.0' id 'com.github.ben-manes.versions' version '0.20.0'
} }
...@@ -12,7 +11,6 @@ allprojects { ...@@ -12,7 +11,6 @@ allprojects {
apply plugin: 'java' apply plugin: 'java'
apply plugin: 'groovy' apply plugin: 'groovy'
apply plugin: 'jacoco' apply plugin: 'jacoco'
apply plugin: 'com.github.ksoichiro.console.reporter'
version = jadxVersion version = jadxVersion
...@@ -41,10 +39,9 @@ allprojects { ...@@ -41,10 +39,9 @@ allprojects {
testCompile 'ch.qos.logback:logback-classic:1.2.3' testCompile 'ch.qos.logback:logback-classic:1.2.3'
testCompile 'junit:junit:4.12' testCompile 'junit:junit:4.12'
testCompile 'org.hamcrest:hamcrest-library:1.3' testCompile 'org.hamcrest:hamcrest-library:2.1'
testCompile 'org.mockito:mockito-core:2.20.1' testCompile 'org.mockito:mockito-core:2.23.4'
testCompile 'org.spockframework:spock-core:1.1-groovy-2.4' testCompile 'org.spockframework:spock-core:1.1-groovy-2.4'
testCompile 'cglib:cglib-nodep:3.2.7'
} }
repositories { repositories {
......
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
...@@ -5,13 +5,13 @@ dependencies { ...@@ -5,13 +5,13 @@ dependencies {
compile files('lib/dx-1.16.jar') compile files('lib/dx-1.16.jar')
compile 'commons-io:commons-io:2.6' compile 'commons-io:commons-io:2.6'
compile 'org.ow2.asm:asm:6.2' compile 'org.ow2.asm:asm:7.0'
compile 'org.jetbrains:annotations:16.0.2' compile 'org.jetbrains:annotations:16.0.3'
compile 'uk.com.robust-it:cloning:1.9.10' compile 'uk.com.robust-it:cloning:1.9.11'
testCompile 'org.smali:smali:2.2.4' testCompile 'org.smali:smali:2.2.5'
testCompile 'org.smali:baksmali:2.2.4' testCompile 'org.smali:baksmali:2.2.5'
testCompile 'org.apache.commons:commons-lang3:3.7' testCompile 'org.apache.commons:commons-lang3:3.8.1'
} }
package jadx.tests.api.utils; package jadx.tests.api.utils;
import org.hamcrest.Description; import org.hamcrest.Description;
import org.hamcrest.core.SubstringMatcher; import org.hamcrest.TypeSafeMatcher;
public class CountString extends SubstringMatcher { public class CountString extends TypeSafeMatcher<String> {
private final int count; private final int count;
private final String substring;
public CountString(int count, String substring) { public CountString(int count, String substring) {
super(substring);
this.count = count; this.count = count;
this.substring = substring;
} }
@Override @Override
protected boolean evalSubstringOf(String string) { protected boolean matchesSafely(String item) {
return this.count == count(string); return this.count == count(item);
} }
@Override @Override
protected String relationship() { public void describeMismatchSafely(String item, Description mismatchDescription) {
return "containing <" + count + "> occurrence of"; mismatchDescription.appendText("found ").appendValue(count(item));
} }
@Override @Override
public void describeMismatchSafely(String item, Description mismatchDescription) { public void describeTo(Description description) {
mismatchDescription.appendText("found ").appendValue(count(item)); description.appendText("containing <" + count + "> occurrence of ").appendValue(this.substring);
} }
private int count(String string) { private int count(String string) {
return TestUtils.count(string, substring); return TestUtils.count(string, this.substring);
} }
} }
...@@ -10,15 +10,15 @@ mainClassName = 'jadx.gui.JadxGUI' ...@@ -10,15 +10,15 @@ mainClassName = 'jadx.gui.JadxGUI'
dependencies { dependencies {
compile(project(":jadx-core")) compile(project(":jadx-core"))
compile(project(":jadx-cli")) compile(project(":jadx-cli"))
compile 'com.fifesoft:rsyntaxtextarea:2.6.1' compile 'com.fifesoft:rsyntaxtextarea:3.0.0'
compile 'com.google.code.gson:gson:2.8.5' compile 'com.google.code.gson:gson:2.8.5'
compile files('libs/jfontchooser-1.0.5.jar') compile files('libs/jfontchooser-1.0.5.jar')
compile 'hu.kazocsaba:image-viewer:1.2.3' compile 'hu.kazocsaba:image-viewer:1.2.3'
compile 'org.apache.commons:commons-lang3:3.7' compile 'org.apache.commons:commons-lang3:3.8.1'
compile 'io.reactivex.rxjava2:rxjava:2.1.17' compile 'io.reactivex.rxjava2:rxjava:2.2.5'
compile "com.github.akarnokd:rxjava2-swing:0.2.16" compile "com.github.akarnokd:rxjava2-swing:0.3.3"
} }
applicationDistribution.with { applicationDistribution.with {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment