From 1058442f52e41e1f3760fb2f2b5733f1a13c66b4 Mon Sep 17 00:00:00 2001 From: Bill Bonney Date: Sun, 12 Nov 2017 17:36:51 -0800 Subject: [PATCH] Update to Tower 4.1.0 Beta 1 --- .travis.yml | 1 + Android/build.gradle | 20 ++++++----- Android/res/raw/changelog.xml | 46 +++--------------------- build.gradle | 14 ++++++-- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 ++ 6 files changed, 30 insertions(+), 55 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0949a2ed37..316bc7d06f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,6 +9,7 @@ android: - platform-tools # The BuildTools version used by your project + - build-tools-25.0.3 - build-tools-24.0.1 - build-tools-23.0.3 diff --git a/Android/build.gradle b/Android/build.gradle index 4e99aba0e6..48fdf720d3 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -21,10 +21,12 @@ dependencies { compile 'com.github.gabrielemariotti.changeloglib:changelog:2.0.0' //DroneKit-Android client lib + // Tower requires 3.0.4+ library (it requires dronekit-android to be checked out) +// compile 'com.o3dr.android:dronekit-android:3.0.4-beta1' // Not released yet compile 'com.o3dr.android:dronekit-android:3.0.2' - //Comment line above, and uncomment line below to use your local version of the dronekit-android client lib - //Don't forget to uncomment the lines in the settings.gradle file as well. -// compile project(':ClientLib') +// Comment line above, and uncomment line below to use your local version of the dronekit-android client lib + // Don't forget to uncomment the lines in the settings.gradle file as well. +// compile project(':ClientLib') compile 'me.grantland:autofittextview:0.2.1' compile(name:'shimmer-android-release', ext:'aar') @@ -50,18 +52,18 @@ dependencies { compile 'com.github.lecho:hellocharts-library:1.5.5@aar' //Leak canary (https://github.com/square/leakcanary) - debugCompile 'com.squareup.leakcanary:leakcanary-android:1.4-beta2' - releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' - testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2' + debugCompile 'com.squareup.leakcanary:leakcanary-android:1.5.4' + releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' + testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.5.4' } def versionPrefix = "Tower-v" //Decomposed version name and code (https://plus.google.com/+JakeWharton/posts/6f5TcVPRZij) def versionMajor = 4 -def versionMinor = 0 +def versionMinor = 1 def versionPatch = 0 -def versionBuild = 10 //bump for dogfood builds, public betas, etc. +def versionBuild = 1 //bump for dogfood builds, public betas, etc. //Logging levels def logLevelVerbose = 2; @@ -226,7 +228,7 @@ android { buildConfigField "boolean", "ENABLE_CRASHLYTICS", "${hasFabricApiKey()}" } } - buildToolsVersion '24.0.1' + buildToolsVersion '25.0.3' } /** diff --git a/Android/res/raw/changelog.xml b/Android/res/raw/changelog.xml index ddfede5a04..d89bfcd95a 100644 --- a/Android/res/raw/changelog.xml +++ b/Android/res/raw/changelog.xml @@ -8,51 +8,13 @@ chg:changeLogFileResourceId="@raw/custom_changelog" in your View component in layout file --> - - - Remove dependency on 3DR Services - Support for Baidu Map - Support for compass calibration for Solo and ArduCopter v3.4 or higher - Improved version of the vehicle history - Ability to export the vehicle flight path as a mission - Ability to export the vehicle flight history as a mission - Deprecate '.dpwp' mission file for '.txt' mission file to improve compatibility with other GCS - Ability to lock the copter yaw during a survey mission - Ability to start camera trigger after the first waypoint in a survey mission - Add Credits page - Fix mission waypoint reordering - Autosave last survey preferences - Fix invalid altitude frame for Follow-Me and Guided mode - Fix parameters editing for plane vehicles - Fix Takeoff mission waypoint for plane vehicles - Improve mission length calculation - Improve portuguese translation - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6473962ded..52d94f5ce9 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { ext { - kotlin_version = '1.0.0' + kotlin_version = '1.1.51' play_services_version = '9.4.0' support_lib_version = '23.4.0' @@ -19,14 +19,18 @@ buildscript { jcenter() mavenCentral() maven { url 'https://maven.fabric.io/public' } + maven { + url 'https://maven.google.com/' + name 'Google' + } } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:2.3.1' classpath 'io.fabric.tools:gradle:1.21.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" //Dexcount gradle plugin - classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.4.4' + classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.2' } } @@ -75,5 +79,9 @@ allprojects { flatDir { dirs 'libs' } + maven { + url 'https://maven.google.com/' + name 'Google' + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 57978fe649..f996fc7797 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/settings.gradle b/settings.gradle index 09ec6da880..f31098b160 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,8 @@ include ':Android' //Uncomment block below to link to your local version of the dronekit-android client lib. //Don't forget to uncomment the lines in the Android/build.gradle file as well. +// !BB! Only supporting in-place compilation at the moment +// until new release of dronekit-android done. /* //Linking to the dronekit-android project to improve development flow include ':ClientLib'