Froyo API 24, disable latest including wear

Use same target and compile version as support lib version
jonasoreland · Jul 18, 2019 · 383c199 · 383c199
1 parent ff7ca51
commit 383c199
Show file tree

Hide file tree

Showing 59 changed files with 19 additions and 7,339 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,6 @@
 env:
   global:
-  - ANDROID_API=28
+  - ANDROID_API=24
   - ANDROID_BUILD_TOOLS=29.0.1
   - ADB_INSTALL_TIMEOUT=5
 language: android
@@ -24,13 +24,9 @@ android:
   - build-tools-$ANDROID_BUILD_TOOLS
   - android-$ANDROID_API
   - extra-android-m2repository
-  - extra-google-m2repository
-  - extra-google-google_play_services
 notifications:
   email: false
 script:
-- ./gradlew wear:lintRelease
-- ./gradlew assembleLatestRelease
-- ./gradlew lintLatestRelease
-- ./gradlew assembleFroyoRelease lintFroyoRelease
+- ./gradlew lintFroyoRelease
+- ./gradlew assembleFroyoRelease
 - ./gradlew test
diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
@@ -44,7 +44,6 @@
 
     <application
         android:allowBackup="true"
-        android:appCategory="maps"
         android:extractNativeLibs="false"
         android:fullBackupContent="@xml/backup_descriptor"
         android:icon="@mipmap/ic_launcher"

diff --git a/app/assets/changes.html b/app/assets/changes.html
@@ -5,6 +5,11 @@
 </head>
 <body>
 <h1>What's new</h1>
+<h2>v2.0.0.9-Froyo</h2>
+<p>
+<ul>
+    <li>Froyo separate fork, removed "latest" flavor. Set TargetAPI to 24.</li>
+</ul>
 <h2>v2.0.0.8</h2>
 <p>
 <ul>

diff --git a/app/build.gradle b/app/build.gradle
@@ -30,30 +30,11 @@ android {
             manifest.srcFile 'froyo/AndroidManifest.xml'
             java.srcDirs = ['froyo/java','free/java']
         }
-        latest {
-            manifest.srcFile 'latest/AndroidManifest.xml'
-            java.srcDirs = ['latest/java']
-            if (rootProject.ext.allowNonFree) {
-                java.srcDirs += ['play/java']
-            } else {
-                java.srcDirs += ['free/java']
-            }
-            res.srcDirs = ['latest/res']
-            assets.srcDirs = ['latest/assets']
-        }
         test.setRoot('test')
     }
 
     flavorDimensions "all"
     productFlavors {
-        latest {
-            dimension "all"
-            minSdkVersion 15
-            compileSdkVersion rootProject.ext.compileSdkVersion
-            targetSdkVersion rootProject.ext.targetSdkVersion
-            versionName rootProject.ext.versionName
-            versionCode 14000000 + rootProject.ext.versionCode
-        }
         froyo {
             dimension "all"
             minSdkVersion 8
@@ -136,20 +117,8 @@ repositories {
 dependencies {
     implementation project(':common')
     implementation project(':hrdevice')
-    if (rootProject.ext.allowNonFree) {
-        latestWearApp project(':wear')
-    }
-
-    latestImplementation "com.android.support:design:${rootProject.ext.supportLibrary}"
-    //Lint bug: https://issuetracker.google.com/issues/231321
-    //noinspection GradleDependency
     froyoImplementation 'com.android.support:design:24.1.0' //SDK <10 dropped in 24.2
 
-    latestImplementation "com.android.support:cardview-v7:${rootProject.ext.supportLibrary}"
-    latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesVersion}"
-    latestImplementation 'com.getpebble:pebblekit:4.0.1'
-    latestImplementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:6.8.1'
-    latestImplementation 'com.jjoe64:graphview:4.2.2'
     froyoImplementation 'com.jjoe64:graphview:4.2.1'
 
     testImplementation "junit:junit:${rootProject.ext.junitVersion}"
@@ -184,7 +153,7 @@ android.applicationVariants.all {
         buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', props.mapboxAccessToken
     }
     else {
-        // Demo key
+        // Invalid token, no map
         buildConfigField 'String', 'MAPBOX_ACCESS_TOKEN', '"pk.eyJ1IjoiY3FucXJkIiwiYSI6ImJmYjcxNDkyZjJiNzllMzYxYjA0NjA1YTI0Mzg4ODA4In0.N9lbcSp06JqIpFSP5X44Fw"'
     }
 

diff --git a/app/latest/AndroidManifest.xml b/app/latest/AndroidManifest.xml
diff --git a/app/latest/assets/egm96-delta.dat b/app/latest/assets/egm96-delta.dat
diff --git a/app/latest/java/org/matthiaszimmermann/location/Location.java b/app/latest/java/org/matthiaszimmermann/location/Location.java
diff --git a/app/latest/java/org/matthiaszimmermann/location/egm96/Cubic.java b/app/latest/java/org/matthiaszimmermann/location/egm96/Cubic.java