Made joda-convert optional

README.md

@@ -57,11 +57,20 @@ public class MyApp extends Application {
 }
 ```
 
-Known Issues
-============
+Joda-Convert and Proguard
+=========================
 
-If you are using versions of the Android Gradle plugin previous to 1.3, you may need to exclude some files for
-packaging to work properly:
+Joda-time classes optionally support [joda-convert](http://www.joda.org/joda-convert/).
+
+**If you do not include joda-convert in your builds and you use Proguard**, you will have to tell Proguard to ignore any
+issues where joda-convert is optionally referenced:
+
+```
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString
+```
+
+**If you include joda-convert in your builds**, you will need to use `packagingOptions` to prevent build issues:
 
 ```groovy
 android {

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.3.0-beta1'
+        classpath 'com.android.tools.build:gradle:1.2.3'
     }
 }
 

library/build.gradle

@@ -16,11 +16,6 @@ android {
     lintOptions {
         lintConfig file('lint.xml')
     }
-
-    packagingOptions {
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/NOTICE.txt'
-    }
 }
 
 apply from: 'gradle-mvn-push.gradle'
@@ -35,7 +30,6 @@ configurations {
 
 dependencies {
     compile 'joda-time:joda-time:2.8:no-tzdb'
-    compile 'org.joda:joda-convert:1.2'
     updateTzData 'joda-time:joda-time:2.8'
 }
 

sample/build.gradle

@@ -10,7 +10,7 @@ android {
         minSdkVersion 9
         targetSdkVersion 22
 
-        proguardFiles getDefaultProguardFile('proguard-android.txt')
+        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'config.pro'
     }
 
     // We're enabling proguard just to prove we don't have to do anything

sample/config.pro

@@ -0,0 +1,3 @@
+# Proguard configuration if not including joda-convert
+-dontwarn org.joda.convert.FromString
+-dontwarn org.joda.convert.ToString