Change to unbundled wear1 release

build.gradle

@@ -17,5 +17,15 @@ allprojects {
     repositories {
         jcenter()
         google()
+        flatDir {
+            dirs 'libs'
+        }
     }
 }
+
+ext {
+    supportVersion = "27.0.2"
+    playServicesVersion = "11.8.0"
+    compileSdkVersion = 26
+    buildToolsVersion = "26.0.2"
+}

gradle.properties

@@ -18,5 +18,5 @@
 # org.gradle.parallel=true
 
 # Always increase version code by 2 since we now package wear seperately and release multi apk
-VERSION_NAME=2.0
-VERSION_CODE=10
+VERSION_NAME=2.1
+VERSION_CODE=12

mobile/build.gradle

@@ -3,15 +3,16 @@ apply plugin: 'com.android.application'
 project.archivesBaseName = "TTW";
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "org.codechimp.ttw"
         minSdkVersion 19
-        targetSdkVersion 27
+        targetSdkVersion 26
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)
+        wearAppUnbundled true
     }
 
     signingConfigs { release }
@@ -31,24 +32,24 @@ android {
     }
 }
 
+
 configurations {
-    wear1Release
+    wear1ReleaseWearApp
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':locale-api')
 
-    wear1Release project(path: ':wear', configuration: 'wear1Release')
-
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:recyclerview-v7:27.0.2'
-    implementation "com.android.support:percent:27.0.2"
-    implementation 'com.google.android.gms:play-services-wearable:11.8.0'
-    implementation 'com.google.android.support:wearable:2.1.0'
-    implementation 'com.android.support:support-v4:27.0.2'
-
+    implementation "com.google.android.gms:play-services-wearable:$rootProject.ext.playServicesVersion"
+    implementation "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
+    implementation "com.android.support:recyclerview-v7:$rootProject.ext.supportVersion"
+    implementation "com.android.support:percent:$rootProject.ext.supportVersion"
+    implementation "com.android.support:preference-v14:$rootProject.ext.supportVersion"
+    implementation "com.android.support:design:$rootProject.ext.supportVersion"
+    implementation "com.android.support:support-v4:$rootProject.ext.supportVersion"
     provided 'com.google.android.wearable:wearable:2.1.0'
+    implementation 'com.google.android.support:wearable:2.1.0'
 }
 
 // Signing properties goes in project root (NOT app)

wear/build.gradle

@@ -7,13 +7,13 @@ android {
     // phone module's build.gradle file
     publishNonDefault true
 
-    compileSdkVersion 27
-    buildToolsVersion '26.0.2'
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
 
     defaultConfig {
         applicationId "org.codechimp.ttw"
         minSdkVersion 23
-        targetSdkVersion 27
+        targetSdkVersion 26
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE) + 1
     }
@@ -28,29 +28,16 @@ android {
         }
     }
 
-    flavorDimensions "wear"
-
-    productFlavors {
-        wear1 {
-            dimension "wear"
-            // Use the defaultConfig value
-        }
-        wear2 {
-            dimension "wear"
-            minSdkVersion 24
-        }
-    }
-
     android.applicationVariants.all { variant ->
         variant.outputs.all {
-            outputFileName = "TTW-${variant.name}-${project.VERSION_NAME}.apk"
+            outputFileName = "TTW-Wear-${variant.name}-${project.VERSION_NAME}.apk"
         }
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.google.android.gms:play-services-wearable:11.6.0'
+    implementation "com.google.android.gms:play-services-wearable:$rootProject.ext.playServicesVersion"
 
     provided 'com.google.android.wearable:wearable:2.1.0'
 }