From 6a7864efaee121b58d196f3907757393a98d4a37 Mon Sep 17 00:00:00 2001 From: Jens Driller Date: Wed, 17 Dec 2014 14:15:34 +0000 Subject: [PATCH 1/2] Update all the Gradle things! --- TextDrawable.iml | 4 +++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- library/build.gradle | 5 ++--- library/library.iml | 9 ++++----- library/src/main/AndroidManifest.xml | 4 +--- sample/build.gradle | 4 ++-- sample/sample.iml | 9 ++++----- 8 files changed, 19 insertions(+), 22 deletions(-) diff --git a/TextDrawable.iml b/TextDrawable.iml index 0bb6048..5550340 100644 --- a/TextDrawable.iml +++ b/TextDrawable.iml @@ -7,7 +7,9 @@ - + + + diff --git a/build.gradle b/build.gradle index 5b75030..3a8a17e 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:0.14.0' + classpath 'com.android.tools.build:gradle:1.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c7f6d60..3a489ca 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Nov 14 11:24:15 SGT 2014 +#Wed Dec 17 14:08:05 GMT 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/library/build.gradle b/library/build.gradle index 44a7d9d..6cddd2b 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,7 +5,6 @@ android { buildToolsVersion "21.1.1" defaultConfig { - applicationId "com.amulyakhare.textdrawable" minSdkVersion 10 targetSdkVersion 21 versionCode 1 @@ -13,7 +12,7 @@ android { } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -21,7 +20,7 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) - compile 'com.android.support:appcompat-v7:21.0.0' + compile 'com.android.support:appcompat-v7:21.0.3' } sourceSets { diff --git a/library/library.iml b/library/library.iml index ef04df8..6a4d4ab 100644 --- a/library/library.iml +++ b/library/library.iml @@ -1,5 +1,5 @@ - + @@ -79,15 +79,14 @@ - - - - + + + diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml index a4307de..66f3376 100644 --- a/library/src/main/AndroidManifest.xml +++ b/library/src/main/AndroidManifest.xml @@ -1,3 +1 @@ - - - + \ No newline at end of file diff --git a/sample/build.gradle b/sample/build.gradle index 7b57924..a48aff4 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -13,7 +13,7 @@ android { } buildTypes { release { - runProguard false + minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } @@ -22,5 +22,5 @@ android { dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile project(':library') - compile 'com.android.support:appcompat-v7:21.0.0' + compile 'com.android.support:appcompat-v7:21.0.3' } \ No newline at end of file diff --git a/sample/sample.iml b/sample/sample.iml index c58ac08..7a04d7b 100644 --- a/sample/sample.iml +++ b/sample/sample.iml @@ -1,5 +1,5 @@ - + @@ -79,13 +79,12 @@ - - - - + + + From fc57cc5264abb3ed7d65b76a6a3f644df2f9ef58 Mon Sep 17 00:00:00 2001 From: Jens Driller Date: Wed, 17 Dec 2014 14:20:09 +0000 Subject: [PATCH 2/2] Remove launcher icon from library --- library/library.iml | 4 ++-- .../src/main/res/drawable-hdpi/ic_launcher.png | Bin 9397 -> 0 bytes .../src/main/res/drawable-mdpi/ic_launcher.png | Bin 5237 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_launcher.png | Bin 14383 -> 0 bytes .../main/res/drawable-xxhdpi/ic_launcher.png | Bin 19388 -> 0 bytes library/src/main/res/values/strings.xml | 3 --- library/src/main/res/values/styles.xml | 8 -------- sample/sample.iml | 1 + 8 files changed, 3 insertions(+), 13 deletions(-) delete mode 100644 library/src/main/res/drawable-hdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-mdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-xhdpi/ic_launcher.png delete mode 100644 library/src/main/res/drawable-xxhdpi/ic_launcher.png delete mode 100644 library/src/main/res/values/strings.xml delete mode 100644 library/src/main/res/values/styles.xml diff --git a/library/library.iml b/library/library.iml index 6a4d4ab..0e9e502 100644 --- a/library/library.iml +++ b/library/library.iml @@ -3,7 +3,7 @@ - @@ -17,7 +17,7 @@