diff --git a/build.gradle b/build.gradle index f7db054..77f80fb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,19 +1,15 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { - mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.3' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.android.tools.build:gradle:2.2.3' } } allprojects { repositories { - mavenCentral() + jcenter() } } diff --git a/example/build.gradle b/example/build.gradle index 948ca13..b3c728e 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion project.TARGET_SDK_VERSION.toInteger() + buildToolsVersion project.BUILD_TOOLS_VERSION defaultConfig { - applicationId "de.mrapp.android.preference.activity.example" - minSdkVersion 11 - targetSdkVersion 24 + minSdkVersion project.MIN_SDK_VERSION.toInteger() + targetSdkVersion project.TARGET_SDK_VERSION.toInteger() versionName project.VERSION_NAME versionCode project.VERSION_CODE.toInteger() } diff --git a/example/example.iml b/example/example.iml index 74f45c6..53cf7f2 100644 --- a/example/example.iml +++ b/example/example.iml @@ -32,12 +32,14 @@ + + @@ -64,14 +66,6 @@ - - - - - - - - @@ -80,37 +74,43 @@ - + + + + + + + + - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 352ffa2..0b63a3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,9 @@ VERSION_NAME=4.2.9 VERSION_CODE=41 GROUP=com.github.michael-rapp +BUILD_TOOLS_VERSION=25.0.2 +MIN_SDK_VERSION=11 +TARGET_SDK_VERSION=25 POM_DESCRIPTION=Provides an alternative implementation of Android's PreferenceActivity. POM_URL=https://github.com/michael-rapp/AndroidPreferenceActivity diff --git a/library/build.gradle b/library/build.gradle index 8ca24a6..cfd9a6f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 24 - buildToolsVersion "24.0.2" + compileSdkVersion project.TARGET_SDK_VERSION.toInteger() + buildToolsVersion project.BUILD_TOOLS_VERSION defaultConfig { - minSdkVersion 11 - targetSdkVersion 24 + minSdkVersion project.MIN_SDK_VERSION.toInteger() + targetSdkVersion project.TARGET_SDK_VERSION.toInteger() versionName project.VERSION_NAME versionCode project.VERSION_CODE.toInteger() } diff --git a/library/library.iml b/library/library.iml index ceb6276..5138a1e 100644 --- a/library/library.iml +++ b/library/library.iml @@ -83,13 +83,8 @@ - - - - - @@ -102,24 +97,15 @@ - - - - - - - - - - +