Update build tools, set sdk versions through gradle

This commit is contained in:
Marvin W 2016-11-14 20:26:09 +01:00
parent 4bffa5799a
commit a0300494f6
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
18 changed files with 38 additions and 47 deletions

View File

@ -12,7 +12,7 @@ script:
android:
components:
- tools
- build-tools-24.0.2
- build-tools-24.0.3
- android-24
- extra-android-m2repository
before_cache:

View File

@ -26,11 +26,15 @@ buildscript {
allprojects {
apply plugin: 'idea'
ext.androidBuildVersionTools = "24.0.2"
ext.androidBuildVersionTools = "24.0.3"
}
def androidCompileSdk() { return 24 }
def androidTargetSdk() { return 24 }
def androidMinSdk() { return 9 }
subprojects {
group = 'org.microg'
repositories {

2
extern/GmsApi vendored

@ -1 +1 @@
Subproject commit 9ff42ae73a02ea971dc557f657b612113dfa6e24
Subproject commit 0b4f43c6a6a091dbdeb0ec544d533373a83ea319

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -18,8 +18,6 @@
<manifest package="org.microg.gms.base"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="9"/>
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version"/>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -15,10 +15,4 @@
~ limitations under the License.
-->
<manifest package="org.microg.gms.cast"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="9"/>
<application/>
</manifest>
<manifest package="org.microg.gms.cast"/>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -15,17 +15,13 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.microg.gms.gcm">
<uses-sdk android:minSdkVersion="9" />
<manifest package="org.microg.gms.gcm"
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Permissions required for GCM -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="android.permission.INTERNET"/>
<!-- Move to play-services-measurement -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<application />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
</manifest>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -15,14 +15,10 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.microg.gms.iid">
<uses-sdk android:minSdkVersion="9" />
<manifest package="org.microg.gms.iid"
xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Permissions required for IID -->
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.INTERNET" />
<application />
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
<uses-permission android:name="android.permission.INTERNET"/>
</manifest>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -15,11 +15,10 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.microg.gms.location">
<manifest package="org.microg.gms.location"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-sdk android:minSdkVersion="9" />
<application>
<receiver android:name="org.microg.gms.location.NativeLocationClientImpl$NativePendingIntentForwarder" />
<receiver android:name="org.microg.gms.location.NativeLocationClientImpl$NativePendingIntentForwarder"/>
</application>
</manifest>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {

View File

@ -15,10 +15,4 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.microg.gms.tasks">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.tasks"/>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
sourceSets {

View File

@ -15,10 +15,4 @@
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.microg.gms.wearable">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.wearable"/>

View File

@ -31,6 +31,8 @@ android {
defaultConfig {
versionName getMyVersionName()
minSdkVersion androidMinSdk()
targetSdkVersion androidTargetSdk()
}
compileOptions {