diff --git a/README.md b/README.md index 8580234..c8f38c2 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,7 @@ repositories { } dependencies { - compile('com.github.jkwiecien:CountingTextView:1.0.10') { - exclude module: 'appcompat-v7' - } + compile 'com.github.jkwiecien:CountingTextView:1.0.10' } ``` diff --git a/build.gradle b/build.gradle index f9ef13b..8e8d669 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.5.0' classpath 'com.github.dcendents:android-maven-plugin:1.2' } } diff --git a/gradle.properties b/gradle.properties index 1d3591c..919c07b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,4 +15,7 @@ # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true + +ANDROID_BUILD_SDK_VERSION=23 +ANDROID_BUILD_TOOLS_VERSION=23.0.2 \ No newline at end of file diff --git a/library/build.gradle b/library/build.gradle index 94072f4..3606433 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,8 +2,8 @@ apply plugin: 'com.android.library' apply plugin: 'android-maven' android { - compileSdkVersion 22 - buildToolsVersion "22.0.0" + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { minSdkVersion 11 @@ -20,6 +20,4 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:22.1.1' } diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index 42e9f4f..600ff3f 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,8 +1 @@ - - - - - - - + diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml deleted file mode 100644 index 47c9ee0..0000000 --- a/library/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - CountingTextView - diff --git a/sample/build.gradle b/sample/build.gradle index b07bf36..4c2de09 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,8 +1,8 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 22 - buildToolsVersion "22.0.0" + compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) + buildToolsVersion project.ANDROID_BUILD_TOOLS_VERSION defaultConfig { applicationId "com.aprilapps.countingtextviewsample" @@ -20,6 +20,6 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - compile(project(':library')) + compile 'com.android.support:appcompat-v7:23.1.1' + compile project(':library') } diff --git a/sample/src/main/java/com/aprilapps/countingtextviewsample/MainActivity.java b/sample/src/main/java/com/aprilapps/countingtextviewsample/MainActivity.java index 269f9a2..fb075a7 100644 --- a/sample/src/main/java/com/aprilapps/countingtextviewsample/MainActivity.java +++ b/sample/src/main/java/com/aprilapps/countingtextviewsample/MainActivity.java @@ -1,14 +1,16 @@ package com.aprilapps.countingtextviewsample; -import android.app.Activity; import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; import android.view.View; import android.widget.Button; +import com.aprilapps.countingtextview.CountingTextView; + import java.util.Random; -public class MainActivity extends Activity { +public class MainActivity extends AppCompatActivity { private Random random = new Random();