Skip to content

Commit

Permalink
updated gradle, fixed dronecode refrences
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Hurst authored and JonasVautherin committed Jul 20, 2019
1 parent 6cb8472 commit 40a0877
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion examples/android-client/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.dronecore.dronecoreclient">
package="io.mavsdk.androidclient">

<uses-permission android:name="android.permission.INTERNET" />

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
import java.util.ArrayList;
import java.util.List;

import io.dronecode_sdk.action.Action;
import io.dronecode_sdk.mission.Mission;
import io.dronecode_sdk.telemetry.Telemetry;
import io.mavsdk.action.Action;
import io.mavsdk.mission.Mission;
import io.mavsdk.telemetry.Telemetry;
import io.reactivex.disposables.Disposable;

import static com.google.android.gms.maps.GoogleMap.MAP_TYPE_HYBRID;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<resources>
<string name="app_name">DroneCoreClient</string>
<string name="app_name">MAVSDK Android Client</string>
<string name="title_activity_maps">Map</string>

<string name="kill">Kill</string>
Expand Down
2 changes: 1 addition & 1 deletion examples/android-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.android.tools.build:gradle:3.4.1'
}
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 04 14:52:27 MDT 2019
#Fri Jul 19 12:40:41 MDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
6 changes: 3 additions & 3 deletions sdk/README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
## Contributing

The SDK implements the DroneCore protobuf interfaces by using RxJava and TDD-style. This means that every single public method of a component must be unit-tested.
The SDK implements the MAVSDK protobuf interfaces by using RxJava and TDD-style. This means that every single public method of a component must be unit-tested.

## Project organization

This is the root of the main "sdk" project, composed of multiple modules. Each module corresponds to a component defined by a protobuf interface (see [DroneCore-Proto](https://github.com/dronecore/DroneCore-Proto)).
This is the root of the main "sdk" project, composed of multiple modules. Each module corresponds to a component defined by a protobuf interface (see [MAVSDK-Proto](https://github.com/mavlink/MAVSDK-Proto)).

Each module is only building a specific part of the overall protobuf interface by using a symbolic link to the corresponding folder in DroneCore-Proto (see for instance [the core module](./dronecore-core/src/main/proto)).
Each module is only building a specific part of the overall protobuf interface by using a symbolic link to the corresponding folder in MAVSDK-Proto (see for instance [the core module](./proto)).

Most of the gradle setup is shared between the components and can be found in [build.gradle](./build.gradle).
4 changes: 2 additions & 2 deletions sdk/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Feb 12 00:05:56 CET 2019
#Fri Jul 19 12:40:41 MDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

0 comments on commit 40a0877

Please sign in to comment.