From c790480c40826cecd5d115c50d6fb7dfb6060b2b Mon Sep 17 00:00:00 2001 From: mar-v-in Date: Fri, 13 Mar 2015 01:41:14 +0100 Subject: [PATCH] Update structure, add maven support --- .gitmodules | 7 +--- GmsApi | 1 - SafeParcel | 2 +- build.gradle | 41 ++++++------------- play-services-api | 1 + play-services-base/build.gradle | 12 ++++++ .../src/main/AndroidManifest.xml | 6 +++ .../android/gms/common/ConnectionResult.java | 0 .../gms/common/GooglePlayServicesClient.java | 0 .../gms/common/GooglePlayServicesUtil.java | 0 .../google/android/gms/common/api/Api.java | 0 .../gms/common/api/GoogleApiClient.java | 0 .../android/gms/common/api/PendingResult.java | 0 .../android/gms/common/api/Releasable.java | 0 .../gms/common/api/ResultCallback.java | 0 .../common/ForwardConnectionCallbacks.java | 0 .../ForwardConnectionFailedListener.java | 0 .../org/microg/gms/common/GmsClient.java | 0 .../org/microg/gms/common/GmsConnector.java | 0 .../gms/common/MultiConnectionKeeper.java | 0 .../gms/common/api/AbstractPendingResult.java | 0 .../api/AbstractPlayServicesClient.java | 0 .../org/microg/gms/common/api/ApiBuilder.java | 0 .../microg/gms/common/api/ApiConnection.java | 0 .../gms/common/api/GoogleApiClientImpl.java | 0 .../gms/common/api/ResultCallbackHandler.java | 0 play-services-location/build.gradle | 11 +++++ .../src/main/AndroidManifest.xml | 0 .../location/FusedLocationProviderApi.java | 0 .../android/gms/location/GeofencingApi.java | 0 .../android/gms/location/LocationClient.java | 0 .../gms/location/LocationListener.java | 0 .../gms/location/LocationServices.java | 0 .../FusedLocationProviderApiImpl.java | 0 .../gms/location/GeofencingApiImpl.java | 0 .../location/GoogleLocationManagerClient.java | 0 .../gms/location/LocationClientImpl.java | 0 .../location/LocationServicesApiBuilder.java | 0 .../location/NativeLocationClientImpl.java | 0 play-services-wearable/build.gradle | 11 +++++ .../src/main/AndroidManifest.xml | 6 +++ .../google/android/gms/wearable/DataApi.java | 0 .../android/gms/wearable/MessageApi.java | 0 .../google/android/gms/wearable/NodeApi.java | 0 .../google/android/gms/wearable/Wearable.java | 0 .../org/microg/gms/wearable/DataApiImpl.java | 0 .../microg/gms/wearable/MessageApiImpl.java | 0 .../org/microg/gms/wearable/NodeApiImpl.java | 0 .../gms/wearable/WearableApiBuilder.java | 0 play-services/build.gradle | 14 +++++++ {res => play-services/res}/values/version.xml | 0 play-services/src/main/AndroidManifest.xml | 6 +++ settings.gradle | 9 +++- 53 files changed, 91 insertions(+), 36 deletions(-) delete mode 160000 GmsApi mode change 160000 => 120000 SafeParcel create mode 160000 play-services-api create mode 100644 play-services-base/build.gradle create mode 100644 play-services-base/src/main/AndroidManifest.xml rename {src => play-services-base/src/main/java}/com/google/android/gms/common/ConnectionResult.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/GooglePlayServicesClient.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/GooglePlayServicesUtil.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/api/Api.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/api/GoogleApiClient.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/api/PendingResult.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/api/Releasable.java (100%) rename {src => play-services-base/src/main/java}/com/google/android/gms/common/api/ResultCallback.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/ForwardConnectionCallbacks.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/ForwardConnectionFailedListener.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/GmsClient.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/GmsConnector.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/MultiConnectionKeeper.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/AbstractPendingResult.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/AbstractPlayServicesClient.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/ApiBuilder.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/ApiConnection.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/GoogleApiClientImpl.java (100%) rename {src => play-services-base/src/main/java}/org/microg/gms/common/api/ResultCallbackHandler.java (100%) create mode 100644 play-services-location/build.gradle rename AndroidManifest.xml => play-services-location/src/main/AndroidManifest.xml (100%) rename {src => play-services-location/src/main/java}/com/google/android/gms/location/FusedLocationProviderApi.java (100%) rename {src => play-services-location/src/main/java}/com/google/android/gms/location/GeofencingApi.java (100%) rename {src => play-services-location/src/main/java}/com/google/android/gms/location/LocationClient.java (100%) rename {src => play-services-location/src/main/java}/com/google/android/gms/location/LocationListener.java (100%) rename {src => play-services-location/src/main/java}/com/google/android/gms/location/LocationServices.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/FusedLocationProviderApiImpl.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/GeofencingApiImpl.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/GoogleLocationManagerClient.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/LocationClientImpl.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/LocationServicesApiBuilder.java (100%) rename {src => play-services-location/src/main/java}/org/microg/gms/location/NativeLocationClientImpl.java (100%) create mode 100644 play-services-wearable/build.gradle create mode 100644 play-services-wearable/src/main/AndroidManifest.xml rename {src => play-services-wearable/src/main/java}/com/google/android/gms/wearable/DataApi.java (100%) rename {src => play-services-wearable/src/main/java}/com/google/android/gms/wearable/MessageApi.java (100%) rename {src => play-services-wearable/src/main/java}/com/google/android/gms/wearable/NodeApi.java (100%) rename {src => play-services-wearable/src/main/java}/com/google/android/gms/wearable/Wearable.java (100%) rename {src => play-services-wearable/src/main/java}/org/microg/gms/wearable/DataApiImpl.java (100%) rename {src => play-services-wearable/src/main/java}/org/microg/gms/wearable/MessageApiImpl.java (100%) rename {src => play-services-wearable/src/main/java}/org/microg/gms/wearable/NodeApiImpl.java (100%) rename {src => play-services-wearable/src/main/java}/org/microg/gms/wearable/WearableApiBuilder.java (100%) create mode 100644 play-services/build.gradle rename {res => play-services/res}/values/version.xml (100%) create mode 100644 play-services/src/main/AndroidManifest.xml diff --git a/.gitmodules b/.gitmodules index 2be15080..bddcb0cc 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "GmsApi"] - path = GmsApi +[submodule "play-services-api"] + path = play-services-api url = https://github.com/microg/android_external_GmsApi.git -[submodule "SafeParcel"] - path = SafeParcel - url = https://github.com/microg/android_external_SafeParcel.git diff --git a/GmsApi b/GmsApi deleted file mode 160000 index 3243e7d3..00000000 --- a/GmsApi +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3243e7d3ecf2f7ff92279b61c4a7e7831356f5c7 diff --git a/SafeParcel b/SafeParcel deleted file mode 160000 index a650ca5b..00000000 --- a/SafeParcel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a650ca5beac2a374460d820935b40f9539e692db diff --git a/SafeParcel b/SafeParcel new file mode 120000 index 00000000..18f7aa75 --- /dev/null +++ b/SafeParcel @@ -0,0 +1 @@ +play-services-api/SafeParcel/ \ No newline at end of file diff --git a/build.gradle b/build.gradle index 15771b0c..252327cb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,30 +1,15 @@ -buildscript { - repositories { - mavenCentral() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.0.1' - } -} - -apply plugin: 'com.android.library' - -dependencies { - compile 'com.android.support:support-v4:21.0.3' - compile project(':GmsApi') -} - -android { - compileSdkVersion 21 - buildToolsVersion "21.1.2" - lintOptions.abortOnError false - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - aidl.srcDirs = ['src'] - res.srcDirs = ['res'] +// Top-level build file where you can add configuration options common to all sub-projects/modules. +subprojects { + buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.github.dcendents:android-maven-plugin:1.2' } } -} + + group = 'org.microg.gms' + version = '1.0-SNAPSHOT' +} \ No newline at end of file diff --git a/play-services-api b/play-services-api new file mode 160000 index 00000000..d2ec5f52 --- /dev/null +++ b/play-services-api @@ -0,0 +1 @@ +Subproject commit d2ec5f52fa6c1aed0640e65130b20e3ffce5f8b0 diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle new file mode 100644 index 00000000..8a308f2f --- /dev/null +++ b/play-services-base/build.gradle @@ -0,0 +1,12 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +dependencies { + compile 'com.android.support:support-v4:22.0.0' + compile project(':play-services-api') +} + +android { + compileSdkVersion 22 + buildToolsVersion "21.1.2" +} diff --git a/play-services-base/src/main/AndroidManifest.xml b/play-services-base/src/main/AndroidManifest.xml new file mode 100644 index 00000000..9fa720e3 --- /dev/null +++ b/play-services-base/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/src/com/google/android/gms/common/ConnectionResult.java b/play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java similarity index 100% rename from src/com/google/android/gms/common/ConnectionResult.java rename to play-services-base/src/main/java/com/google/android/gms/common/ConnectionResult.java diff --git a/src/com/google/android/gms/common/GooglePlayServicesClient.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java similarity index 100% rename from src/com/google/android/gms/common/GooglePlayServicesClient.java rename to play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesClient.java diff --git a/src/com/google/android/gms/common/GooglePlayServicesUtil.java b/play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java similarity index 100% rename from src/com/google/android/gms/common/GooglePlayServicesUtil.java rename to play-services-base/src/main/java/com/google/android/gms/common/GooglePlayServicesUtil.java diff --git a/src/com/google/android/gms/common/api/Api.java b/play-services-base/src/main/java/com/google/android/gms/common/api/Api.java similarity index 100% rename from src/com/google/android/gms/common/api/Api.java rename to play-services-base/src/main/java/com/google/android/gms/common/api/Api.java diff --git a/src/com/google/android/gms/common/api/GoogleApiClient.java b/play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java similarity index 100% rename from src/com/google/android/gms/common/api/GoogleApiClient.java rename to play-services-base/src/main/java/com/google/android/gms/common/api/GoogleApiClient.java diff --git a/src/com/google/android/gms/common/api/PendingResult.java b/play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java similarity index 100% rename from src/com/google/android/gms/common/api/PendingResult.java rename to play-services-base/src/main/java/com/google/android/gms/common/api/PendingResult.java diff --git a/src/com/google/android/gms/common/api/Releasable.java b/play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java similarity index 100% rename from src/com/google/android/gms/common/api/Releasable.java rename to play-services-base/src/main/java/com/google/android/gms/common/api/Releasable.java diff --git a/src/com/google/android/gms/common/api/ResultCallback.java b/play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java similarity index 100% rename from src/com/google/android/gms/common/api/ResultCallback.java rename to play-services-base/src/main/java/com/google/android/gms/common/api/ResultCallback.java diff --git a/src/org/microg/gms/common/ForwardConnectionCallbacks.java b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java similarity index 100% rename from src/org/microg/gms/common/ForwardConnectionCallbacks.java rename to play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionCallbacks.java diff --git a/src/org/microg/gms/common/ForwardConnectionFailedListener.java b/play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java similarity index 100% rename from src/org/microg/gms/common/ForwardConnectionFailedListener.java rename to play-services-base/src/main/java/org/microg/gms/common/ForwardConnectionFailedListener.java diff --git a/src/org/microg/gms/common/GmsClient.java b/play-services-base/src/main/java/org/microg/gms/common/GmsClient.java similarity index 100% rename from src/org/microg/gms/common/GmsClient.java rename to play-services-base/src/main/java/org/microg/gms/common/GmsClient.java diff --git a/src/org/microg/gms/common/GmsConnector.java b/play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java similarity index 100% rename from src/org/microg/gms/common/GmsConnector.java rename to play-services-base/src/main/java/org/microg/gms/common/GmsConnector.java diff --git a/src/org/microg/gms/common/MultiConnectionKeeper.java b/play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java similarity index 100% rename from src/org/microg/gms/common/MultiConnectionKeeper.java rename to play-services-base/src/main/java/org/microg/gms/common/MultiConnectionKeeper.java diff --git a/src/org/microg/gms/common/api/AbstractPendingResult.java b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java similarity index 100% rename from src/org/microg/gms/common/api/AbstractPendingResult.java rename to play-services-base/src/main/java/org/microg/gms/common/api/AbstractPendingResult.java diff --git a/src/org/microg/gms/common/api/AbstractPlayServicesClient.java b/play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java similarity index 100% rename from src/org/microg/gms/common/api/AbstractPlayServicesClient.java rename to play-services-base/src/main/java/org/microg/gms/common/api/AbstractPlayServicesClient.java diff --git a/src/org/microg/gms/common/api/ApiBuilder.java b/play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java similarity index 100% rename from src/org/microg/gms/common/api/ApiBuilder.java rename to play-services-base/src/main/java/org/microg/gms/common/api/ApiBuilder.java diff --git a/src/org/microg/gms/common/api/ApiConnection.java b/play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java similarity index 100% rename from src/org/microg/gms/common/api/ApiConnection.java rename to play-services-base/src/main/java/org/microg/gms/common/api/ApiConnection.java diff --git a/src/org/microg/gms/common/api/GoogleApiClientImpl.java b/play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java similarity index 100% rename from src/org/microg/gms/common/api/GoogleApiClientImpl.java rename to play-services-base/src/main/java/org/microg/gms/common/api/GoogleApiClientImpl.java diff --git a/src/org/microg/gms/common/api/ResultCallbackHandler.java b/play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java similarity index 100% rename from src/org/microg/gms/common/api/ResultCallbackHandler.java rename to play-services-base/src/main/java/org/microg/gms/common/api/ResultCallbackHandler.java diff --git a/play-services-location/build.gradle b/play-services-location/build.gradle new file mode 100644 index 00000000..f79b92c5 --- /dev/null +++ b/play-services-location/build.gradle @@ -0,0 +1,11 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +dependencies { + compile project(':play-services-base') +} + +android { + compileSdkVersion 22 + buildToolsVersion "22.0.0" +} \ No newline at end of file diff --git a/AndroidManifest.xml b/play-services-location/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to play-services-location/src/main/AndroidManifest.xml diff --git a/src/com/google/android/gms/location/FusedLocationProviderApi.java b/play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java similarity index 100% rename from src/com/google/android/gms/location/FusedLocationProviderApi.java rename to play-services-location/src/main/java/com/google/android/gms/location/FusedLocationProviderApi.java diff --git a/src/com/google/android/gms/location/GeofencingApi.java b/play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java similarity index 100% rename from src/com/google/android/gms/location/GeofencingApi.java rename to play-services-location/src/main/java/com/google/android/gms/location/GeofencingApi.java diff --git a/src/com/google/android/gms/location/LocationClient.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java similarity index 100% rename from src/com/google/android/gms/location/LocationClient.java rename to play-services-location/src/main/java/com/google/android/gms/location/LocationClient.java diff --git a/src/com/google/android/gms/location/LocationListener.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java similarity index 100% rename from src/com/google/android/gms/location/LocationListener.java rename to play-services-location/src/main/java/com/google/android/gms/location/LocationListener.java diff --git a/src/com/google/android/gms/location/LocationServices.java b/play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java similarity index 100% rename from src/com/google/android/gms/location/LocationServices.java rename to play-services-location/src/main/java/com/google/android/gms/location/LocationServices.java diff --git a/src/org/microg/gms/location/FusedLocationProviderApiImpl.java b/play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java similarity index 100% rename from src/org/microg/gms/location/FusedLocationProviderApiImpl.java rename to play-services-location/src/main/java/org/microg/gms/location/FusedLocationProviderApiImpl.java diff --git a/src/org/microg/gms/location/GeofencingApiImpl.java b/play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java similarity index 100% rename from src/org/microg/gms/location/GeofencingApiImpl.java rename to play-services-location/src/main/java/org/microg/gms/location/GeofencingApiImpl.java diff --git a/src/org/microg/gms/location/GoogleLocationManagerClient.java b/play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java similarity index 100% rename from src/org/microg/gms/location/GoogleLocationManagerClient.java rename to play-services-location/src/main/java/org/microg/gms/location/GoogleLocationManagerClient.java diff --git a/src/org/microg/gms/location/LocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java similarity index 100% rename from src/org/microg/gms/location/LocationClientImpl.java rename to play-services-location/src/main/java/org/microg/gms/location/LocationClientImpl.java diff --git a/src/org/microg/gms/location/LocationServicesApiBuilder.java b/play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java similarity index 100% rename from src/org/microg/gms/location/LocationServicesApiBuilder.java rename to play-services-location/src/main/java/org/microg/gms/location/LocationServicesApiBuilder.java diff --git a/src/org/microg/gms/location/NativeLocationClientImpl.java b/play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java similarity index 100% rename from src/org/microg/gms/location/NativeLocationClientImpl.java rename to play-services-location/src/main/java/org/microg/gms/location/NativeLocationClientImpl.java diff --git a/play-services-wearable/build.gradle b/play-services-wearable/build.gradle new file mode 100644 index 00000000..5e701f76 --- /dev/null +++ b/play-services-wearable/build.gradle @@ -0,0 +1,11 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +dependencies { + compile project(':play-services-base') +} + +android { + compileSdkVersion 21 + buildToolsVersion "21.1.2" +} diff --git a/play-services-wearable/src/main/AndroidManifest.xml b/play-services-wearable/src/main/AndroidManifest.xml new file mode 100644 index 00000000..9fa720e3 --- /dev/null +++ b/play-services-wearable/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/src/com/google/android/gms/wearable/DataApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java similarity index 100% rename from src/com/google/android/gms/wearable/DataApi.java rename to play-services-wearable/src/main/java/com/google/android/gms/wearable/DataApi.java diff --git a/src/com/google/android/gms/wearable/MessageApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java similarity index 100% rename from src/com/google/android/gms/wearable/MessageApi.java rename to play-services-wearable/src/main/java/com/google/android/gms/wearable/MessageApi.java diff --git a/src/com/google/android/gms/wearable/NodeApi.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java similarity index 100% rename from src/com/google/android/gms/wearable/NodeApi.java rename to play-services-wearable/src/main/java/com/google/android/gms/wearable/NodeApi.java diff --git a/src/com/google/android/gms/wearable/Wearable.java b/play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java similarity index 100% rename from src/com/google/android/gms/wearable/Wearable.java rename to play-services-wearable/src/main/java/com/google/android/gms/wearable/Wearable.java diff --git a/src/org/microg/gms/wearable/DataApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java similarity index 100% rename from src/org/microg/gms/wearable/DataApiImpl.java rename to play-services-wearable/src/main/java/org/microg/gms/wearable/DataApiImpl.java diff --git a/src/org/microg/gms/wearable/MessageApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java similarity index 100% rename from src/org/microg/gms/wearable/MessageApiImpl.java rename to play-services-wearable/src/main/java/org/microg/gms/wearable/MessageApiImpl.java diff --git a/src/org/microg/gms/wearable/NodeApiImpl.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java similarity index 100% rename from src/org/microg/gms/wearable/NodeApiImpl.java rename to play-services-wearable/src/main/java/org/microg/gms/wearable/NodeApiImpl.java diff --git a/src/org/microg/gms/wearable/WearableApiBuilder.java b/play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java similarity index 100% rename from src/org/microg/gms/wearable/WearableApiBuilder.java rename to play-services-wearable/src/main/java/org/microg/gms/wearable/WearableApiBuilder.java diff --git a/play-services/build.gradle b/play-services/build.gradle new file mode 100644 index 00000000..4d357641 --- /dev/null +++ b/play-services/build.gradle @@ -0,0 +1,14 @@ +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') +} + +android { + compileSdkVersion 21 + buildToolsVersion "22.0.0" +} diff --git a/res/values/version.xml b/play-services/res/values/version.xml similarity index 100% rename from res/values/version.xml rename to play-services/res/values/version.xml diff --git a/play-services/src/main/AndroidManifest.xml b/play-services/src/main/AndroidManifest.xml new file mode 100644 index 00000000..9fa720e3 --- /dev/null +++ b/play-services/src/main/AndroidManifest.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/settings.gradle b/settings.gradle index 87e5535f..c87b1990 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1,8 @@ -include ':GmsApi', ':SafeParcel' +include ':SafeParcel' +include ':play-services-api' + +include ':play-services-base' +include ':play-services-location' +include ':play-services-wearable' + +include ':play-services'