Skip to content

Commit 1db1955

Browse files
committed
Disable wear
Google Play requires update from the ancient play wear version, which requires migration to the ancient (non-bundled) wear interface. The wear app was not built as it was.
1 parent 5cd88d0 commit 1db1955

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

app/build.gradle

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,15 @@ android {
1919
java.srcDirs = ['src/main']
2020
if (rootProject.ext.allowNonFree) {
2121
java.srcDirs += ['src/play']
22+
if (rootProject.ext.enableWear) {
23+
java.srcDirs += ['src/wear']
24+
}
25+
else {
26+
java.srcDirs += ['src/nonwear']
27+
}
2228
} else {
2329
java.srcDirs += ['src/free']
30+
java.srcDirs += ['src/nonwear']
2431
}
2532
resources.srcDirs = java.srcDirs
2633
aidl.srcDirs = java.srcDirs

app/src/free/org/runnerup/tracker/component/TrackerWear.java renamed to app/src/nonwear/org/runnerup/tracker/component/TrackerWear.java

File renamed without changes.

app/src/play/org/runnerup/tracker/component/TrackerWear.java renamed to app/src/wear/org/runnerup/tracker/component/TrackerWear.java

File renamed without changes.

build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ project.ext {
2323
appcompat_version = "1.7.0"
2424
annotation_version = "1.6.0"
2525
preference_version = "1.2.1"
26-
//Note: Later Play Services will require a rewrite of NodeApi.NodeListener
27-
googlePlayServicesVersion = '11.0.4'
26+
//Note: Play Services later than 11.0.4 disables wear, requires a rewrite of NodeApi.NodeListener
27+
googlePlayServicesVersion = '21.3.0'
2828
googleWearVersion = '2.9.0'
2929

3030
junitVersion = '4.13.2'
@@ -37,7 +37,8 @@ project.ext {
3737

3838
// F-Droid builds only allow free software (wear dir deleted at builds)
3939
allowNonFree = !project.hasProperty('org.runnerup.free') && rootProject.file("wear").exists()
40-
enableWear = allowNonFree
40+
// wear disabled, requires Play services migration
41+
enableWear = false
4142

4243
// Note: AntPlus may have to be downloaded explicitly due to licensing
4344
// Therefore, the .aar file may not be redistributed in the RU repo

0 commit comments

Comments
 (0)