From 0663acc9ccd82ba7996e3758884f11738aceda84 Mon Sep 17 00:00:00 2001 From: v1nc Date: Thu, 6 Feb 2020 17:41:30 +0100 Subject: [PATCH] add firefox preview nightly, push to 1.3.3 --- app/build.gradle | 4 +-- app/release/output.json | 28 ++++++++----------- .../systems/userjsupdater/MainActivity.java | 3 +- build.gradle | 2 +- .../androidx/appcompat/group-index.xml | 4 +-- .../lint-cache/maven.google/master-index.xml | 15 ++++++++++ 6 files changed, 34 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 64484d6..d7d43f2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "de.reckendrees.systems.userjsupdater" minSdkVersion 21 targetSdkVersion 28 - versionCode 5 - versionName '1.3.2' + versionCode 6 + versionName '1.3.3' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/release/output.json b/app/release/output.json index ac993b0..4a1a869 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1,24 +1,20 @@ { "version": 1, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, "applicationId": "de.reckendrees.systems.userjsupdater", - "variantType": "BASE_APK", + "variantName": "release", "elements": [ { - "outputType": { - "type": "APK" - }, - "apkData": { - "type": "MAIN", - "splits": [], - "versionCode": 4, - "versionName": "1.3", - "outputFile": "app-release.apk", - "fullName": "release", - "baseName": "release", - "dirName": "" - }, - "path": "app-release.apk", - "properties": {} + "type": "SINGLE", + "filters": [], + "properties": [], + "versionCode": 6, + "versionName": "6", + "enabled": true, + "outputFile": "app-release.apk" } ] } \ No newline at end of file diff --git a/app/src/main/java/de/reckendrees/systems/userjsupdater/MainActivity.java b/app/src/main/java/de/reckendrees/systems/userjsupdater/MainActivity.java index 47a4470..1fefe2e 100644 --- a/app/src/main/java/de/reckendrees/systems/userjsupdater/MainActivity.java +++ b/app/src/main/java/de/reckendrees/systems/userjsupdater/MainActivity.java @@ -61,7 +61,7 @@ public class MainActivity extends AppCompatActivity implements DownloadInterface Button button; SharedPreferences prefs; Map packageNameMap = new HashMap(); - final CharSequence browserList[] = {"Fennec F-Droid", "Firefox Preview", "IceCat", "Firefox", "Orfox" }; + final CharSequence browserList[] = {"Fennec F-Droid", "Firefox Preview", "Firefox Preview Nightly","IceCat", "Firefox", "Orfox" }; SharedPreferences.Editor editor; BroadcastReceiver onComplete; @@ -410,6 +410,7 @@ private void initDialog(AlertDialog.Builder alertDialogBuilder, String title){ private void initPackgeNameMap(){ packageNameMap.put("Fennec F-Droid", "org.mozilla.fennec_fdroid"); packageNameMap.put("Firefox Preview", "org.mozilla.fenix"); + packageNameMap.put("Firefox Preview Nightly","org.mozilla.fenix.nightly"); packageNameMap.put("IceCat", "org.gnu.icecat"); packageNameMap.put("Firefox", "org.mozilla.firefox"); packageNameMap.put("Orfox", "info.guardianproject.orfox"); diff --git a/build.gradle b/build.gradle index dfad6cb..dfa06e0 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0-alpha08' + classpath 'com.android.tools.build:gradle:4.0.0-alpha09' // NOTE: Do not place your application dependencies here; they belong diff --git a/build/intermediates/lint-cache/maven.google/androidx/appcompat/group-index.xml b/build/intermediates/lint-cache/maven.google/androidx/appcompat/group-index.xml index 105bac0..a5e50a4 100644 --- a/build/intermediates/lint-cache/maven.google/androidx/appcompat/group-index.xml +++ b/build/intermediates/lint-cache/maven.google/androidx/appcompat/group-index.xml @@ -1,5 +1,5 @@ - - + + diff --git a/build/intermediates/lint-cache/maven.google/master-index.xml b/build/intermediates/lint-cache/maven.google/master-index.xml index c28b52e..9f0ec77 100644 --- a/build/intermediates/lint-cache/maven.google/master-index.xml +++ b/build/intermediates/lint-cache/maven.google/master-index.xml @@ -123,4 +123,19 @@ + + + + + + + + + + + + + + +