Update structure, add maven support

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "GmsApi"]
+[submodule "play-services-api"]
-	path = GmsApi
+	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

GmsApi

@@ -1 +0,0 @@
-Subproject commit 3243e7d3ecf2f7ff92279b61c4a7e7831356f5c7

SafeParcel

@@ -1 +0,0 @@
-Subproject commit a650ca5beac2a374460d820935b40f9539e692db

SafeParcel

@@ -0,0 +1 @@
+play-services-api/SafeParcel/

build.gradle

@@ -1,30 +1,15 @@
-buildscript {
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
-    repositories {
+subprojects {
-        mavenCentral()
+    buildscript {
-    }
+        repositories {
-    dependencies {
+            mavenCentral()
-        classpath 'com.android.tools.build:gradle:1.0.1'
+        }
-    }
+        dependencies {
-}
+            classpath 'com.android.tools.build:gradle:1.0.1'
-
+            classpath 'com.github.dcendents:android-maven-plugin:1.2'
-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']
         }
     }
-}
+
+    group = 'org.microg.gms'
+    version = '1.0-SNAPSHOT'
+}

play-services-api

@@ -0,0 +1 @@
+Subproject commit d2ec5f52fa6c1aed0640e65130b20e3ffce5f8b0

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"
+}

play-services-base/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.gms">
+
+    <uses-sdk android:minSdkVersion="9" />
+</manifest>

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"
+}

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"
+}

play-services-wearable/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.gms">
+
+    <uses-sdk android:minSdkVersion="9" />
+</manifest>

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"
+}

play-services/src/main/AndroidManifest.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.google.android.gms">
+
+    <uses-sdk android:minSdkVersion="9" />
+</manifest>

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'