Skip to content
This repository was archived by the owner on Jan 1, 2023. It is now read-only.

Commit 8db836c

Browse files
Updated SDK versions
1 parent 8ebf825 commit 8db836c

File tree

4 files changed

+32
-15
lines changed

4 files changed

+32
-15
lines changed

locale-api/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 22
4+
compileSdkVersion 25
55
buildToolsVersion "22.0.1"
66

77
defaultConfig {
88
minSdkVersion 3
9-
targetSdkVersion 17
9+
targetSdkVersion 25
1010
versionCode 1
1111
versionName "1.0"
1212
}

mobile/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ apply plugin: 'com.android.application'
33
project.archivesBaseName = "TTW";
44

55
android {
6-
compileSdkVersion 22
6+
compileSdkVersion 25
77
buildToolsVersion "22.0.1"
88

99
defaultConfig {
1010
applicationId "org.codechimp.ttw"
11-
minSdkVersion 18
12-
targetSdkVersion 22
11+
minSdkVersion 19
12+
targetSdkVersion 25
1313
versionName project.VERSION_NAME
1414
versionCode Integer.parseInt(project.VERSION_CODE)
1515
}
@@ -28,11 +28,11 @@ android {
2828
dependencies {
2929
compile fileTree(dir: 'libs', include: ['*.jar'])
3030
compile project(':locale-api')
31-
wearApp project(':wear')
32-
compile 'com.android.support:appcompat-v7:22.2.1'
33-
compile 'com.android.support:recyclerview-v7:22.2.1'
34-
compile 'com.google.android.gms:play-services-wearable:7.3.0'
35-
compile 'com.android.support:support-v4:22.2.1'
31+
wearApp project(path: ':wear', configuration: 'wear1Release')
32+
compile 'com.android.support:appcompat-v7:25.1.0'
33+
compile 'com.android.support:recyclerview-v7:25.1.0'
34+
compile 'com.google.android.gms:play-services-wearable:10.0.1'
35+
compile 'com.android.support:support-v4:25.1.0'
3636
}
3737

3838
def Properties props = new Properties()

wear/build.gradle

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,17 @@ apply plugin: 'com.android.application'
22

33

44
android {
5-
compileSdkVersion 22
5+
// Allows you to reference product flavors in your
6+
// phone module's build.gradle file
7+
publishNonDefault true
8+
9+
compileSdkVersion 24
610
buildToolsVersion "22.0.1"
711

812
defaultConfig {
913
applicationId "org.codechimp.ttw"
10-
minSdkVersion 21
11-
targetSdkVersion 22
14+
minSdkVersion 23
15+
targetSdkVersion 24
1216
versionName project.VERSION_NAME
1317
versionCode Integer.parseInt(project.VERSION_CODE)
1418
}
@@ -22,12 +26,21 @@ android {
2226
signingConfig signingConfigs.release
2327
}
2428
}
29+
30+
productFlavors {
31+
wear1 {
32+
// Use the defaultConfig value
33+
}
34+
wear2 {
35+
minSdkVersion 24
36+
}
37+
}
2538
}
2639

2740
dependencies {
2841
compile fileTree(dir: 'libs', include: ['*.jar'])
29-
compile 'com.google.android.support:wearable:1.1.0'
30-
compile 'com.google.android.gms:play-services-wearable:7.3.0'
42+
compile 'com.google.android.support:wearable:1.4.0'
43+
compile 'com.google.android.gms:play-services-wearable:10.0.1'
3144
}
3245

3346
def Properties props = new Properties()

wear/src/main/AndroidManifest.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@
1111
android:theme="@android:style/Theme.DeviceDefault"
1212
android:icon="@mipmap/ic_launcher">
1313

14+
<meta-data
15+
android:name="com.google.android.wearable.standalone"
16+
android:value="false" />
17+
1418
<service android:name=".WearListenerService">
1519
<intent-filter>
1620
<action android:name="com.google.android.gms.wearable.BIND_LISTENER" />

0 commit comments

Comments
 (0)