Official v4.4.0.24 release

JTechMe · Sep 15, 2017 · defe008 · defe008
1 parent d6c75a0
commit defe008
Show file tree

Hide file tree

Showing 4 changed files with 76 additions and 73 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -8,11 +8,11 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="jumpgoDevDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleJumpgoDevDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileJumpgoDevDebugSources" />
+        <option name="SELECTED_BUILD_VARIANT" value="jumpgomainDebug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleJumpgomainDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileJumpgomainDebugSources" />
         <afterSyncTasks>
-          <task>generateJumpgoDevDebugSources</task>
+          <task>generateJumpgomainDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -44,67 +44,67 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/jumpgoDev/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/jumpgoDev/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/jumpgomain/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/jumpgomain/debug" />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/jumpgoDev/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/jumpgoDev/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/jumpgoDev/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/jumpgoDev/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/jumpgoDev/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/jumpgoDev/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/jumpgoDev/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/jumpgoDev/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDevDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/jumpgoDev/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/jumpgoDev/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDevDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/jumpgoDev/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDevDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/jumpgoDev/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgoDev/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgoDev/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/jumpgomain/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/jumpgomain/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/jumpgomain/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/jumpgomain/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/jumpgomain/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/google-services/jumpgomain/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/jumpgomain/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/jumpgomain/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomainDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/jumpgomain/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/jumpgomain/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomainDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/jumpgomain/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomainDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/jumpgomain/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testJumpgomain/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestJumpgomain/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -54,9 +54,10 @@ android {
             versionCode project.versionCode_main
             versionName project.versionNameMain
             //manifestPlaceholders = [
-            //        appIcon: "@mipmap/ic_launcher"]
+            //        appIcon: "@mipmap/ic_launcher_beta"
+            //]
             //manifestPlaceholders = [
-            //        appIconRound: "@mipmap/ic_launcher_round"
+            //        appIconRound: "@mipmap/ic_launcher_beta_round"
             //]
         }
 
@@ -67,7 +68,8 @@ android {
             versionName project.versionNameDev
 
             //manifestPlaceholders = [
-            //        appIcon: "@mipmap/ic_launcher_dev"]
+            //        appIcon: "@mipmap/ic_launcher_dev"
+            //]
             //manifestPlaceholders = [
             //        appIconRound: "@mipmap/ic_launcher_dev_round"
             //]
@@ -153,6 +155,7 @@ dependencies {
     compile 'com.firebase:firebase-jobdispatcher:0.7.0'
 
 
+
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -28,8 +28,8 @@
         android:name=".BrowserApp"
         android:allowBackup="true"
         android:hardwareAccelerated="true"
-        android:icon="@mipmap/ic_launcher_dev"
-        android:roundIcon="@mipmap/ic_launcher_dev_round"
+        android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="@string/app_name">
         <meta-data
             android:name="android.webkit.WebView.MetricsOptOut"

diff --git a/build.gradle b/build.gradle
@@ -29,10 +29,10 @@ ext {
 
     //Please use the new naming system stated here:
     //Version naming system: major.minor[.revision[.build[-channel[.release]]]]
-    versionNameDev = '4.4.0.24-dev.05'
-    versionNameMain = '4.4.0.24-beta.03'
+    versionNameDev = '4.4.0.24-dev.06'
+    versionNameMain = '4.4.0.24'
     //versionCode_lite = 98
     //versionCode_plus = 120
-    versionCode_dev = 129
-    versionCode_main = 124
+    versionCode_dev = 130
+    versionCode_main = 125
 }