File tree Expand file tree Collapse file tree 4 files changed +11
-3
lines changed
nonwear/org/runnerup/tracker/component
wear/org/runnerup/tracker/component Expand file tree Collapse file tree 4 files changed +11
-3
lines changed Original file line number Diff line number Diff 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
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff 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
You can’t perform that action at this time.
0 commit comments