Skip to content

Commit

Permalink
deps: update api version
Browse files Browse the repository at this point in the history
  • Loading branch information
Netdex committed Jul 29, 2023
1 parent 2e25e1d commit d26321c
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 21 deletions.
18 changes: 10 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,22 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
namespace 'org.netdex.androidusbscript'
}

dependencies {
implementation 'androidx.core:core:1.8.0'
implementation 'com.google.android.material:material:1.6.1'
implementation 'androidx.core:core:1.10.1'
implementation 'com.google.android.material:material:1.9.0'

implementation 'org.luaj:luaj-jse:3.0.1'
implementation 'androidx.appcompat:appcompat:1.5.0'
implementation 'androidx.appcompat:appcompat:1.6.1'

def libsu = '5.0.2'
implementation "com.github.topjohnwu.libsu:core:${libsu}"
implementation "com.github.topjohnwu.libsu:service:${libsu}"
implementation "com.github.topjohnwu.libsu:nio:${libsu}"
implementation "com.github.topjohnwu.libsu:io:${libsu}"
implementation "com.github.topjohnwu.libsu:core:5.2.0"
implementation "com.github.topjohnwu.libsu:service:5.2.0"
implementation "com.github.topjohnwu.libsu:nio:5.2.0"
implementation "com.github.topjohnwu.libsu:io:5.2.0"

implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0")) // ???
}
repositories {
mavenCentral()
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.netdex.androidusbscript">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

<application
android:icon="@mipmap/ic_fuzzer"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ public void remove(FileSystem fs) throws IOException {

public boolean isSupported(FileSystem fs) {
return fs.exists(configFsPath_)
&& fs.getSystemProp("sys.usb.configfs").equals("1");
&& Integer.parseInt(fs.getSystemProp("sys.usb.configfs")) >= 1;
}

public String getGadgetPath(String gadgetName) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.io.IOException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit;

public class LuaUsbService extends Service {
Expand Down Expand Up @@ -62,7 +61,7 @@ public LuaUsbService() {
@Override
public void onServiceConnected(ComponentName name, IBinder service) {
super.onServiceConnected(name, service);
fs_ = new FileSystem(this.getRemoteFS());
fs_ = new FileSystem(this.getRemoteFs());
}
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,23 @@
import com.topjohnwu.superuser.nio.FileSystemManager;

public class RootServiceConnection implements ServiceConnection {
private FileSystemManager remoteFS_ = null;
private FileSystemManager remoteFs_ = null;

@Override
public void onServiceConnected(ComponentName name, IBinder service) {
try {
remoteFS_ = FileSystemManager.getRemote(service);
remoteFs_ = FileSystemManager.getRemote(service);
} catch (RemoteException e) {
e.printStackTrace();
}
}

@Override
public void onServiceDisconnected(ComponentName name) {
remoteFS_ = null;
remoteFs_ = null;
}

public FileSystemManager getRemoteFS() {
return remoteFS_;
public FileSystemManager getRemoteFs() {
return remoteFs_;
}
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ buildscript {
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.2'
classpath 'com.android.tools.build:gradle:8.0.2'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
#Fri Nov 13 11:15:42 EST 2020
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.enableJetifier=false
android.nonFinalResIds=false
android.nonTransitiveRClass=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

0 comments on commit d26321c

Please sign in to comment.