Fix Android-x86 crashes related to manifest changes

[android-x86/packages-apps-Taskbar.git] / app / build.gradle

diff --git a/app/build.gradle b/app/build.gradle
index a2213b9..cd7dc0c 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,47 +1,34 @@
 ext {
-    SUPPORT_LIBRARY_VERSION = "25.3.1"
-}
-
-buildscript {
-    repositories {
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.6.1'
-    }
+    SUPPORT_LIBRARY_VERSION = "27.1.1"
+    SDK_VERSION = 27
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
 
 repositories {
-    maven {
-        url "https://maven.google.com"
-    }
-
-    maven {
-        url "https://jitpack.io"
-    }
+    google()
+    maven { url "https://jitpack.io" }
 }
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.3"
+    compileSdkVersion SDK_VERSION
+    buildToolsVersion "27.0.3"
 
     defaultConfig {
         applicationId "com.farmerbb.taskbar"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion SDK_VERSION
 
-        versionCode 151
-        versionName "3.5"
+        // TODO keep versionName and versionCode in sync with Android-x86 manifest
+        versionCode 184
+        versionName "3.9.2"
 
-        resConfigs "en", "ja", "ru", "de"
+        resConfigs "en", "ja", "ru", "de", "zh-rCN", "tr"
 
         buildConfigField "String", "BASE_APPLICATION_ID", "\"com.farmerbb.taskbar\""
         buildConfigField "String", "PAID_APPLICATION_ID", "\"com.farmerbb.taskbar.paid\""
         buildConfigField "String", "SUPPORT_APPLICATION_ID", "\"com.farmerbb.taskbar.support\""
+        buildConfigField "String", "ANDROIDX86_APPLICATION_ID", "\"com.farmerbb.taskbar.androidx86\""
     }
 
     compileOptions {
@@ -75,24 +62,29 @@ android {
         }
     }
 
+    flavorDimensions "default"
+
     productFlavors {
-        paid {
-            applicationId "com.farmerbb.taskbar.paid"
-        }
+        paid { applicationId "com.farmerbb.taskbar.paid" }
+        free { applicationId "com.farmerbb.taskbar" }
+    }
 
-        free {
-            applicationId "com.farmerbb.taskbar"
+    sourceSets {
+        main {
+            java { srcDirs('src/main/java', 'src/playstore/java', "src/compat-${SDK_VERSION}/java") }
+            res { srcDirs('src/main/res', 'src/playstore/res') }
+            manifest.srcFile 'src/playstore/AndroidManifest.xml'
         }
     }
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
-    compile "com.android.support:design:${SUPPORT_LIBRARY_VERSION}"
-    compile 'com.github.enricocid:cpl:1.0.2'
-    compile 'com.mikepenz:iconics-core:2.8.3@aar'
-    compile 'com.mikepenz:foundation-icons-typeface:3.0.0.2@aar'
-    compile 'moe.banana:toast-compat:1.0.5'
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    implementation "com.android.support:appcompat-v7:${SUPPORT_LIBRARY_VERSION}"
+    implementation "com.android.support:design:${SUPPORT_LIBRARY_VERSION}"
+    implementation 'com.mikepenz:iconics-core:3.0.4@aar'
+    implementation 'com.mikepenz:foundation-icons-typeface:3.0.0.3@aar'
+    implementation 'moe.banana:toast-compat:1.0.5'
+    implementation group:'com.twofortyfouram', name:'android-plugin-api-for-locale', version:'[1.0.2,2.0['
 }