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.

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

Project libraries update #855

Merged
merged 2 commits into from
Jul 3, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 12 additions & 6 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,26 @@
language: android
android:
components:
- build-tools-19.1.0
- android-19
- platform-tools
- tools
licenses:
- 'android-sdk-license-.+'

script:
- ./gradlew build
before_script:
- echo yes | android update sdk -u -a -t tools
- echo yes | android update sdk -u -a -t build-tools-20.0.0,build-tools-19.1.0
- echo yes | android update sdk -u -a -t android-20,android-19
- echo yes | android update sdk -u -a -t extra-google-m2repository
- echo yes | android update sdk -u -a -t extra-android-m2repository
- echo yes | android update sdk -u -a -t extra-android-support,extra-google-google_play_services

script: ./gradlew build

deploy:
provider: releases
api_key:
secure: N1sRQjwlExc51dA10dOvzdnkYMh9/X9WZmKwYqnWOguV+0dg3Jw2xXyBRxZLO1olIlIV0XGaI1HLAAO0OaFEYyWMO9BkZ60aJC8gePGnnwk1LSYR2moGAtlF6Y+aumfMZzXG4gU4QlVKbMd0uLvUWKu6eTqoMtVe+/C8GeJn6pk=
file:
- "./Android/build/outputs/apk/Android-release-unsigned.apk"
file: "./Android/build/outputs/apk/Android-release-unsigned.apk"
skip_cleanup: true
on:
tags: true
Expand Down
4 changes: 2 additions & 2 deletions Android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ repositories {
}

dependencies {
compile 'com.android.support:support-v4:19.+'
compile 'com.android.support:support-v4:20.+'
compile files('libs/droneapi-java.jar')
compile 'com.google.android.gms:play-services:4.+'
compile 'com.google.android.gms:play-services:5.+'
compile 'com.google.guava:guava:17.0'
compile 'org.slf4j:slf4j-api:1.7.7'
compile 'org.slf4j:slf4j-nop:1.7.7'
Expand Down
Binary file modified Android/libs/android-support-v4.jar
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.droidplanner.android.notifications;

import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.support.v4.app.NotificationCompat;
import android.support.v4.app.NotificationManagerCompat;
import android.util.Log;
import android.widget.Toast;

Expand Down Expand Up @@ -190,18 +190,14 @@ private void showNotification() {
if (mNotificationBuilder == null) { return; }

mNotificationBuilder.setStyle(mInboxBuilder.generateInboxStyle());
NotificationManager notMgr = (NotificationManager) mContext.getSystemService(Context
.NOTIFICATION_SERVICE);
notMgr.notify(NOTIFICATION_ID, mNotificationBuilder.build());
NotificationManagerCompat.from(mContext).notify(NOTIFICATION_ID, mNotificationBuilder.build());
}

/**
* Dismiss the app status bar notification.
*/
private void dismissNotification() {
NotificationManager notMgr = (NotificationManager) mContext.getSystemService(Context
.NOTIFICATION_SERVICE);
notMgr.cancelAll();
NotificationManagerCompat.from(mContext).cancelAll();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
apply plugin: 'com.android.library'

dependencies {
compile 'com.android.support:support-v4:19.+'
compile 'com.android.support:support-v4:20.+'
}

android {
Expand Down
Binary file not shown.
2 changes: 1 addition & 1 deletion Mavlink/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apply plugin: 'com.android.library'

dependencies {
compile 'com.android.support:support-v4:19.+'
compile 'com.android.support:support-v4:20.+'
}

android {
Expand Down
Binary file modified Mavlink/libs/android-support-v4.jar
Binary file not shown.
4 changes: 1 addition & 3 deletions google-play-services_lib/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/ub-gcore-kenafa-release/vendor/unbundled_google/packages/OneUp/client/AndroidManifest.xml -->
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="4452000" android:versionName="4.4.52-000" package="com.google.android.gms">
--><!-- From: file:/usr/local/google/buildbot/repo_clients/https___googleplex-android.googlesource.com_a_platform_manifest.git/ub-gcore-longhorn-release/vendor/unbundled_google/packages/OneUp/client/AndroidManifest.xml --><manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="5077000" android:versionName="5.0.77-000" package="com.google.android.gms">
<uses-sdk android:minSdkVersion="9"/>
<application/>
</manifest>
Binary file modified google-play-services_lib/libs/google-play-services.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion google-play-services_lib/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
target=android-9
android.library=true
11 changes: 11 additions & 0 deletions google-play-services_lib/res/values/admob_iap_style.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.IAPTheme" parent="android:Theme">
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:backgroundDimEnabled">false</item>
</style>
</resources>
2 changes: 1 addition & 1 deletion google-play-services_lib/res/values/version.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="google_play_services_version">4452000</integer>
<integer name="google_play_services_version">5077000</integer>
</resources>