Skip to content

Commit d26321c

Browse files
committed
deps: update api version
1 parent 2e25e1d commit d26321c

File tree

8 files changed

+25
-21
lines changed

8 files changed

+25
-21
lines changed

app/build.gradle

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,22 @@ android {
2121
targetCompatibility JavaVersion.VERSION_1_8
2222
sourceCompatibility JavaVersion.VERSION_1_8
2323
}
24+
namespace 'org.netdex.androidusbscript'
2425
}
2526

2627
dependencies {
27-
implementation 'androidx.core:core:1.8.0'
28-
implementation 'com.google.android.material:material:1.6.1'
28+
implementation 'androidx.core:core:1.10.1'
29+
implementation 'com.google.android.material:material:1.9.0'
2930

3031
implementation 'org.luaj:luaj-jse:3.0.1'
31-
implementation 'androidx.appcompat:appcompat:1.5.0'
32+
implementation 'androidx.appcompat:appcompat:1.6.1'
3233

33-
def libsu = '5.0.2'
34-
implementation "com.github.topjohnwu.libsu:core:${libsu}"
35-
implementation "com.github.topjohnwu.libsu:service:${libsu}"
36-
implementation "com.github.topjohnwu.libsu:nio:${libsu}"
37-
implementation "com.github.topjohnwu.libsu:io:${libsu}"
34+
implementation "com.github.topjohnwu.libsu:core:5.2.0"
35+
implementation "com.github.topjohnwu.libsu:service:5.2.0"
36+
implementation "com.github.topjohnwu.libsu:nio:5.2.0"
37+
implementation "com.github.topjohnwu.libsu:io:5.2.0"
38+
39+
implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) // ???
3840
}
3941
repositories {
4042
mavenCentral()

app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.netdex.androidusbscript">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
43

54
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
5+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
66

77
<application
88
android:icon="@mipmap/ic_fuzzer"

app/src/main/java/org/netdex/androidusbscript/configfs/UsbGadget.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ public void remove(FileSystem fs) throws IOException {
121121

122122
public boolean isSupported(FileSystem fs) {
123123
return fs.exists(configFsPath_)
124-
&& fs.getSystemProp("sys.usb.configfs").equals("1");
124+
&& Integer.parseInt(fs.getSystemProp("sys.usb.configfs")) >= 1;
125125
}
126126

127127
public String getGadgetPath(String gadgetName) {

app/src/main/java/org/netdex/androidusbscript/service/LuaUsbService.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import java.io.IOException;
2626
import java.util.concurrent.ExecutorService;
2727
import java.util.concurrent.Executors;
28-
import java.util.concurrent.Future;
2928
import java.util.concurrent.TimeUnit;
3029

3130
public class LuaUsbService extends Service {
@@ -62,7 +61,7 @@ public LuaUsbService() {
6261
@Override
6362
public void onServiceConnected(ComponentName name, IBinder service) {
6463
super.onServiceConnected(name, service);
65-
fs_ = new FileSystem(this.getRemoteFS());
64+
fs_ = new FileSystem(this.getRemoteFs());
6665
}
6766
};
6867
}

app/src/main/java/org/netdex/androidusbscript/service/RootServiceConnection.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@
88
import com.topjohnwu.superuser.nio.FileSystemManager;
99

1010
public class RootServiceConnection implements ServiceConnection {
11-
private FileSystemManager remoteFS_ = null;
11+
private FileSystemManager remoteFs_ = null;
1212

1313
@Override
1414
public void onServiceConnected(ComponentName name, IBinder service) {
1515
try {
16-
remoteFS_ = FileSystemManager.getRemote(service);
16+
remoteFs_ = FileSystemManager.getRemote(service);
1717
} catch (RemoteException e) {
1818
e.printStackTrace();
1919
}
2020
}
2121

2222
@Override
2323
public void onServiceDisconnected(ComponentName name) {
24-
remoteFS_ = null;
24+
remoteFs_ = null;
2525
}
2626

27-
public FileSystemManager getRemoteFS() {
28-
return remoteFS_;
27+
public FileSystemManager getRemoteFs() {
28+
return remoteFs_;
2929
}
3030
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ buildscript {
1010
google()
1111
}
1212
dependencies {
13-
classpath 'com.android.tools.build:gradle:7.2.2'
13+
classpath 'com.android.tools.build:gradle:8.0.2'
1414

1515
// NOTE: Do not place your application dependencies here; they belong
1616
// in the individual module build.gradle files

gradle.properties

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
1212
# org.gradle.parallel=true
1313
#Fri Nov 13 11:15:42 EST 2020
14-
android.enableJetifier=true
14+
android.defaults.buildfeatures.buildconfig=true
15+
android.enableJetifier=false
16+
android.nonFinalResIds=false
17+
android.nonTransitiveRClass=true
1518
android.useAndroidX=true
1619
org.gradle.jvmargs=-Xmx1536m

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

0 commit comments

Comments
 (0)