Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to Tower 4.1.0 Beta 1 #1879

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update to Tower 4.1.0 Beta 1 #1879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 11 additions & 9 deletions Android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand All @@ -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;
Expand Down Expand Up @@ -226,7 +228,7 @@ android {
buildConfigField "boolean", "ENABLE_CRASHLYTICS", "${hasFabricApiKey()}"
}
}
buildToolsVersion '24.0.1'
buildToolsVersion '25.0.3'
}

/**
Expand Down
46 changes: 4 additions & 42 deletions Android/res/raw/changelog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,13 @@
chg:changeLogFileResourceId="@raw/custom_changelog"
in your View component in layout file -->

<!--
TODO: enable for version 4.1.0
<changelogversion versionName="4.1.0" changeDate="Sept 30, 2016">
<changelogimprovement>Add weather widget</changelogimprovement>
<changelogversion versionName="4.1.0" changeDate="Nov 12, 2017">
<changelogimprovement>Fix SiK Radio not showing RSSI</changelogimprovement>
<changelogimprovement>Vehicle Specific Icons (Settings)</changelogimprovement>
<changelogimprovement>dronekit-android updated MAVLINK messages.</changelogimprovement>
</changelogversion>
-->

<changelogversion versionName="4.0.0" changeDate="Oct 9, 2016">
<changelogimprovement>Remove dependency on 3DR Services</changelogimprovement>
<changelogimprovement>Support for Baidu Map</changelogimprovement>
<changelogimprovement>Support for compass calibration for Solo and ArduCopter v3.4 or higher</changelogimprovement>
<changelogimprovement>Improved version of the vehicle history</changelogimprovement>
<changelogimprovement>Ability to export the vehicle flight path as a mission</changelogimprovement>
<changelogimprovement>Ability to export the vehicle flight history as a mission</changelogimprovement>
<changelogimprovement>Deprecate '.dpwp' mission file for '.txt' mission file to improve compatibility with other GCS</changelogimprovement>
<changelogimprovement>Ability to lock the copter yaw during a survey mission</changelogimprovement>
<changelogimprovement>Ability to start camera trigger after the first waypoint in a survey mission</changelogimprovement>

<changelogtext>Add Credits page</changelogtext>
<changelogtext>Fix mission waypoint reordering</changelogtext>
<changelogtext>Autosave last survey preferences</changelogtext>
<changelogtext>Fix invalid altitude frame for Follow-Me and Guided mode</changelogtext>
<changelogtext>Fix parameters editing for plane vehicles</changelogtext>
<changelogtext>Fix Takeoff mission waypoint for plane vehicles</changelogtext>
<changelogtext>Improve mission length calculation</changelogtext>

<changelogtext>Improve portuguese translation</changelogtext>
</changelogversion>

<!--<changelogversion versionName="3.2.1" changeDate="May 12,2016">-->
<!--<changelogimprovement>[b]UVC[/b] devices support by [i]Guilherme Blanco[/i]</changelogimprovement>-->
<!--<changelogimprovement>Google Cardboard [b]FPV[/b] support thanks to [b]DronePro[/b] by [i]Shawn Fraser[/i]</changelogimprovement>-->
<!--<changelogimprovement>Add ability to set a custom video stream. Check the [i][b]Tower Wiki[/b][/i] for setup instructions</changelogimprovement>-->
<!--<changelogimprovement>Add [i]Reset ROI[/i] mission item</changelogimprovement>-->
<!--<changelogimprovement>Add support for [b]ArcGIS[/b] map tiles</changelogimprovement>-->

<!--<changelogtext>Update UX for the telemetry connection preferences</changelogtext>-->
<!--<changelogtext>Remove support for [b]Droneshare[/b] accounts as the site is closing down</changelogtext>-->

<!--<changelogtext>Navigation Drawer update to Material Design by [i]jandrop[/i]</changelogtext>-->
<!--<changelogtext>Improve spanish translation</changelogtext>-->
<!--<changelogtext>Improve german translation</changelogtext>-->
<!--<changelogtext>Improve chinese translation</changelogtext>-->
<!--<changelogtext>Improve portuguese translation</changelogtext>-->

<!--</changelogversion>-->

</changelog>
14 changes: 11 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
}
}

Expand Down Expand Up @@ -75,5 +79,9 @@ allprojects {
flatDir {
dirs 'libs'
}
maven {
url 'https://maven.google.com/'
name 'Google'
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down