Update build tools, set sdk versions through gradle

This commit is contained in:
Marvin W 2016-11-14 20:21:14 +01:00
parent 9ff42ae73a
commit 0b4f43c6a6
No known key found for this signature in database
GPG Key ID: 072E9235DB996F2A
16 changed files with 27 additions and 51 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 {
repositories {
jcenter()

View File

@ -34,6 +34,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.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.api"/>

View File

@ -39,6 +39,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.basement">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.basement"/>

View File

@ -34,6 +34,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.cast.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.cast.api"/>

View File

@ -34,6 +34,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.cast.framework.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.cast.framework.api"/>

View File

@ -34,6 +34,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.iid.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.iid.api"/>

View File

@ -34,6 +34,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.location.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.location.api"/>

View File

@ -34,6 +34,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.wearable.api">
<uses-sdk android:minSdkVersion="9" />
<application />
</manifest>
<manifest package="org.microg.gms.wearable.api"/>