From d47deb067f661d777ff02ce04e9910cd2f205555 Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Fri, 13 Mar 2015 02:24:01 +0100 Subject: [PATCH] Various fixes for gradle/maven --- .gitignore | 1 + play-services-api | 2 +- play-services-base/src/main/AndroidManifest.xml | 2 ++ .../src/main}/res/values/version.xml | 0 play-services-location/src/main/AndroidManifest.xml | 2 +- play-services-wearable/src/main/AndroidManifest.xml | 4 +++- play-services/build.gradle | 1 - play-services/src/main/AndroidManifest.xml | 4 +++- 8 files changed, 11 insertions(+), 5 deletions(-) rename {play-services => play-services-base/src/main}/res/values/version.xml (100%) diff --git a/.gitignore b/.gitignore index 5a0e68a2..769ee68c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ out/ build/ +.idea/ *.iml local.properties .gradle/ diff --git a/play-services-api b/play-services-api index d2ec5f52..dbae4add 160000 --- a/play-services-api +++ b/play-services-api @@ -1 +1 @@ -Subproject commit d2ec5f52fa6c1aed0640e65130b20e3ffce5f8b0 +Subproject commit dbae4add94505fb0765ca9a18896848df6ae6ae4 diff --git a/play-services-base/src/main/AndroidManifest.xml b/play-services-base/src/main/AndroidManifest.xml index 9fa720e3..d3685676 100644 --- a/play-services-base/src/main/AndroidManifest.xml +++ b/play-services-base/src/main/AndroidManifest.xml @@ -3,4 +3,6 @@ package="com.google.android.gms"> + + diff --git a/play-services/res/values/version.xml b/play-services-base/src/main/res/values/version.xml similarity index 100% rename from play-services/res/values/version.xml rename to play-services-base/src/main/res/values/version.xml diff --git a/play-services-location/src/main/AndroidManifest.xml b/play-services-location/src/main/AndroidManifest.xml index b0fcdc8e..32fad327 100644 --- a/play-services-location/src/main/AndroidManifest.xml +++ b/play-services-location/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="org.microg.gms.location"> diff --git a/play-services-wearable/src/main/AndroidManifest.xml b/play-services-wearable/src/main/AndroidManifest.xml index 9fa720e3..33723d79 100644 --- a/play-services-wearable/src/main/AndroidManifest.xml +++ b/play-services-wearable/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + package="org.microg.gms.wearable"> + + diff --git a/play-services/build.gradle b/play-services/build.gradle index 4d357641..1646fc2f 100644 --- a/play-services/build.gradle +++ b/play-services/build.gradle @@ -2,7 +2,6 @@ apply plugin: 'com.android.library' apply plugin: 'com.github.dcendents.android-maven' dependencies { - compile 'com.android.support:support-v4:21.0.3' compile project(':play-services-base') compile project(':play-services-location') compile project(':play-services-wearable') diff --git a/play-services/src/main/AndroidManifest.xml b/play-services/src/main/AndroidManifest.xml index 9fa720e3..336be92b 100644 --- a/play-services/src/main/AndroidManifest.xml +++ b/play-services/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ + package="org.microg.gms"> + +