diff --git a/app/build.gradle b/app/build.gradle index f326b06..914f392 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { applicationId "com.tomerrosenfeld.analogclockview" @@ -23,5 +23,5 @@ dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:25.3.1' - compile project(':custom-analog-clock-view') + compile project(':library') } diff --git a/custom-analog-clock-view/.gitignore b/library/.gitignore similarity index 100% rename from custom-analog-clock-view/.gitignore rename to library/.gitignore diff --git a/custom-analog-clock-view/build.gradle b/library/build.gradle similarity index 95% rename from custom-analog-clock-view/build.gradle rename to library/build.gradle index eac9fd2..66196ce 100644 --- a/custom-analog-clock-view/build.gradle +++ b/library/build.gradle @@ -14,7 +14,7 @@ ext { siteUrl = 'https://github.com/rosenpin/custom-analog-clock-view' gitUrl = 'https://github.com/rosenpin/custom-analog-clock-view.git' - libraryVersion = '1.05' + libraryVersion = '1.1' developerId = 'rosenpin' developerName = 'Tomer Rosenfeld' @@ -27,7 +27,7 @@ ext { android { compileSdkVersion 25 - buildToolsVersion "25.0.2" + buildToolsVersion "25.0.3" defaultConfig { minSdkVersion 14 diff --git a/custom-analog-clock-view/proguard-rules.pro b/library/proguard-rules.pro similarity index 100% rename from custom-analog-clock-view/proguard-rules.pro rename to library/proguard-rules.pro diff --git a/custom-analog-clock-view/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml similarity index 100% rename from custom-analog-clock-view/src/main/AndroidManifest.xml rename to library/src/main/AndroidManifest.xml diff --git a/custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/CustomAnalogClock.java b/library/src/main/java/com/tomerrosenfeld/customanalogclockview/CustomAnalogClock.java similarity index 100% rename from custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/CustomAnalogClock.java rename to library/src/main/java/com/tomerrosenfeld/customanalogclockview/CustomAnalogClock.java diff --git a/custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/DialOverlay.java b/library/src/main/java/com/tomerrosenfeld/customanalogclockview/DialOverlay.java similarity index 100% rename from custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/DialOverlay.java rename to library/src/main/java/com/tomerrosenfeld/customanalogclockview/DialOverlay.java diff --git a/custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/HandsOverlay.java b/library/src/main/java/com/tomerrosenfeld/customanalogclockview/HandsOverlay.java similarity index 100% rename from custom-analog-clock-view/src/main/java/com/tomerrosenfeld/customanalogclockview/HandsOverlay.java rename to library/src/main/java/com/tomerrosenfeld/customanalogclockview/HandsOverlay.java diff --git a/custom-analog-clock-view/src/main/res/drawable-xhdpi/default_face.png b/library/src/main/res/drawable-xhdpi/default_face.png similarity index 100% rename from custom-analog-clock-view/src/main/res/drawable-xhdpi/default_face.png rename to library/src/main/res/drawable-xhdpi/default_face.png diff --git a/custom-analog-clock-view/src/main/res/drawable-xhdpi/default_hour_hand.png b/library/src/main/res/drawable-xhdpi/default_hour_hand.png similarity index 100% rename from custom-analog-clock-view/src/main/res/drawable-xhdpi/default_hour_hand.png rename to library/src/main/res/drawable-xhdpi/default_hour_hand.png diff --git a/custom-analog-clock-view/src/main/res/drawable-xhdpi/default_minute_hand.png b/library/src/main/res/drawable-xhdpi/default_minute_hand.png similarity index 100% rename from custom-analog-clock-view/src/main/res/drawable-xhdpi/default_minute_hand.png rename to library/src/main/res/drawable-xhdpi/default_minute_hand.png diff --git a/custom-analog-clock-view/src/main/res/values/attrs.xml b/library/src/main/res/values/attrs.xml similarity index 100% rename from custom-analog-clock-view/src/main/res/values/attrs.xml rename to library/src/main/res/values/attrs.xml diff --git a/settings.gradle b/settings.gradle index f2d564c..3306997 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':custom-analog-clock-view' +include ':app', ':library'