update libraries and dependencies's version

This commit is contained in:
hyb1996
2018-10-06 10:12:29 +08:00
parent 9d1fdf3fe9
commit 4851790ad9
20 changed files with 155 additions and 115 deletions

View File

@@ -1,12 +1,12 @@
apply plugin: 'com.android.library'
android {
compileSdkVersion 27
buildToolsVersion '27.0.3'
compileSdkVersion versions.compile
buildToolsVersion versions.buildTool
defaultConfig {
minSdkVersion 17
targetSdkVersion 25
minSdkVersion versions.mini
targetSdkVersion versions.target
versionCode 1
versionName "1.0"
@@ -35,35 +35,34 @@ repositories {
}
dependencies {
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
testCompile 'junit:junit:4.12'
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'org.greenrobot:eventbus:3.0.0'
compile 'net.lingala.zip4j:zip4j:1.3.2'
compile('com.afollestad.material-dialogs:core:0.9.2.3', {
testImplementation 'junit:junit:4.12'
api fileTree(dir: 'libs', include: ['*.jar'])
api 'org.greenrobot:eventbus:3.0.0'
api 'net.lingala.zip4j:zip4j:1.3.2'
api('com.afollestad.material-dialogs:core:0.9.2.3', {
exclude group: 'com.android.support'
})
compile 'com.android.support:design:25.4.0'
compile 'com.android.support:appcompat-v7:25.4.0'
compile 'com.github.hyb1996:EnhancedFloaty:0.21'
compile 'com.github.hyb1996:OpenCvLib:2.4.13.4-imgproc'
compile 'com.makeramen:roundedimageview:2.3.0'
api 'com.android.support:design:28.0.0'
api 'com.github.hyb1996:EnhancedFloaty:0.21'
api 'com.github.hyb1996:OpenCvLib:2.4.13.4-imgproc'
api 'com.makeramen:roundedimageview:2.3.0'
// OkHttp
compile 'com.squareup.okhttp3:okhttp:3.9.0'
api 'com.squareup.okhttp3:okhttp:3.10.0'
//JDeferred
compile 'org.jdeferred:jdeferred-android-aar:1.2.6'
api 'org.jdeferred:jdeferred-android-aar:1.2.6'
//RootShell
compile 'com.github.Stericson:RootShell:1.6'
api 'com.github.Stericson:RootShell:1.6'
// Gson
compile 'com.google.code.gson:gson:2.8.0'
api 'com.google.code.gson:gson:2.8.2'
// Terminal emulator
compile(name: 'libtermexec-release', ext: 'aar')
compile(name: 'emulatorview-release', ext: 'aar')
compile(name: 'term-debug', ext: 'aar')
compile files('libs/rhino-1.7.7.2.jar')
compile project(path: ':common')
compile project(path: ':automator')
api(name: 'libtermexec-release', ext: 'aar')
api(name: 'emulatorview-release', ext: 'aar')
api(name: 'term-debug', ext: 'aar')
api files('libs/rhino-1.7.7.2.jar')
api project(path: ':common')
api project(path: ':automator')
}

View File

@@ -15,6 +15,10 @@ import com.stardust.automator.UiObjectCollection;
import com.stardust.automator.filter.DfsFilter;
import com.stardust.view.accessibility.AccessibilityNodeInfoAllocator;
import java.net.InetAddress;
import java.net.ServerSocket;
import java.net.Socket;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ACCESSIBILITY_FOCUS;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_COLUMN_INT;
import static android.support.v4.view.accessibility.AccessibilityNodeInfoCompat.ACTION_ARGUMENT_PROGRESS_VALUE;
@@ -98,6 +102,7 @@ public class UiSelector extends UiGlobalSelector {
return regex;
}
@Override
public UiGlobalSelector classNameMatches(String regex) {
return super.classNameMatches(convertRegex(regex));

View File

@@ -93,10 +93,6 @@ public class ScriptCanvas {
return mCanvas.save();
}
public int save(int saveFlags) {
return mCanvas.save(saveFlags);
}
public int saveLayer(@Nullable RectF bounds, @Nullable Paint paint, int saveFlags) {
return mCanvas.saveLayer(bounds, paint, saveFlags);
}

View File

@@ -5,6 +5,7 @@ import android.content.Context;
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
import android.util.Log;
import com.stardust.autojs.core.looper.LooperHelper;
import com.stardust.autojs.script.JavaScriptSource;
@@ -44,6 +45,7 @@ public class LoopBasedJavaScriptEngine extends RhinoJavaScriptEngine {
if (callback != null)
callback.onResult(o);
} catch (Exception e) {
Log.d("DDDDD", "execute: " + e.getMessage());
if (callback == null) {
throw e;
} else {

View File

@@ -205,6 +205,7 @@ public class RhinoJavaScriptEngine extends JavaScriptEngine {
@Override
protected void observeInstructionCount(Context cx, int instructionCount) {
if (Thread.currentThread().isInterrupted() && Looper.myLooper() != Looper.getMainLooper()) {
Log.d("DDDDD", "thread interrupt: " + Thread.currentThread());
throw new ScriptInterruptedException();
}
}