diff --git a/.gitignore b/.gitignore index 3daa7a4..466b131 100644 --- a/.gitignore +++ b/.gitignore @@ -1,45 +1,5 @@ -# From https://gist.github.com/iainconnor/8605514 -# with the addition of the /captures below. -/captures - -# Built application files build/ -*.apk -*.so -.externalNativeBuild - -# Crashlytics configuations -com_crashlytics_export_strings.xml - -# Local configuration file (sdk path, etc) local.properties - -# Gradle generated files .gradle/ - -# Signing files -.signing/ - -# User-specific configurations -.idea/libraries/ -.idea/workspace.xml -.idea/tasks.xml -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml -.idea/dictionaries/ -*.iml - -# OS-specific files -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db +.idea/ +*.iml \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml deleted file mode 100644 index cde9d86..0000000 --- a/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 956ac03..0000000 --- a/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/README.md b/README.md index 2f64c8b..17eb784 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Termux:Boot A [Termux](https://termux.com) add-on app to run programs at boot. - [Termux:Boot on Google Play](https://play.google.com/store/apps/details?id=com.termux.boot) -- [Termux:Boot on F-Droid](https://f-droid.org/en/packages/com.termux.boot/) +- [Termux:Boot on F-Droid](https://f-droid.org/packages/com.termux.boot) When developing (or packaging), note that this app needs to be signed with the same key as the main Termux app in order to have the permission to execute scripts. diff --git a/app/.gitignore b/app/.gitignore deleted file mode 100644 index 796b96d..0000000 --- a/app/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/app/build.gradle b/app/build.gradle index a8f0b79..1524c94 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,19 +1,14 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 - buildToolsVersion "27.0.1" - - dependencies { - compile 'com.android.support:support-annotations:27.0.0' - } - + compileSdkVersion 28 + buildToolsVersion '28.0.2' defaultConfig { applicationId "com.termux.boot" minSdkVersion 21 - targetSdkVersion 27 - versionCode 5 - versionName "0.5" + targetSdkVersion 28 + versionCode 6 + versionName "0.6" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } @@ -23,5 +18,17 @@ android { shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } + debug { + zipAlignEnabled true + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 } } + +dependencies { + implementation 'com.android.support:support-annotations:28.0.0-rc02' +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 43a73d2..c1f0677 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools" + package="com.termux.boot" + android:sharedUserId="com.termux"> @@ -20,7 +20,9 @@ - + diff --git a/app/src/main/java/com/termux/boot/BootActivity.java b/app/src/main/java/com/termux/boot/BootActivity.java index 4d1e39c..4312ad4 100644 --- a/app/src/main/java/com/termux/boot/BootActivity.java +++ b/app/src/main/java/com/termux/boot/BootActivity.java @@ -14,5 +14,4 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { webView.loadUrl("file:///android_asset/overview.html"); setContentView(webView); } - } diff --git a/app/src/main/java/com/termux/boot/BootJobService.java b/app/src/main/java/com/termux/boot/BootJobService.java index 6483e64..a1a53fb 100644 --- a/app/src/main/java/com/termux/boot/BootJobService.java +++ b/app/src/main/java/com/termux/boot/BootJobService.java @@ -42,5 +42,4 @@ public boolean onStartJob(JobParameters params) { public boolean onStopJob(JobParameters params) { return true; } - } diff --git a/app/src/main/java/com/termux/boot/BootReceiver.java b/app/src/main/java/com/termux/boot/BootReceiver.java index a9fd80a..9f7a265 100644 --- a/app/src/main/java/com/termux/boot/BootReceiver.java +++ b/app/src/main/java/com/termux/boot/BootReceiver.java @@ -12,7 +12,6 @@ import java.io.File; import java.util.Arrays; -import java.util.Comparator; public class BootReceiver extends BroadcastReceiver { @@ -26,12 +25,7 @@ public void onReceive(Context context, Intent intent) { if (files == null) files = new File[0]; // Sort files so that they get executed in a repeatable and logical order. - Arrays.sort(files, new Comparator() { - @Override - public int compare(File f1, File f2) { - return f1.getName().compareTo(f2.getName()); - } - }); + Arrays.sort(files, (f1, f2) -> f1.getName().compareTo(f2.getName())); StringBuilder logMessage = new StringBuilder(); for (File file : files) { @@ -68,5 +62,4 @@ private static void ensureFileReadableAndExecutable(File file) { if (!file.canRead()) file.setReadable(true); if (!file.canExecute()) file.setExecutable(true); } - } diff --git a/build.gradle b/build.gradle index 3955d3a..eefddd1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,18 @@ buildscript { repositories { - google() jcenter() + google() } + dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' + classpath 'com.android.tools.build:gradle:3.1.4' } } allprojects { repositories { jcenter() - maven { - url "https://maven.google.com" - } + google() } } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 27768f1..1353677 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 62e1e30..5c1b6c9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ -distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-bin.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists