Update jems, androidcarrot, contentpal dependencies. #477 (#478)

dmfs · Nov 17, 2017 · a29d04c · a29d04c
1 parent 015c6d3
commit a29d04c
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -4,5 +4,6 @@ MIN_SDK_VERSION=9
 TARGET_SDK_VERSION=25
 # dependency versions
 SUPPORT_LIBRARY_VERSION=25.0.1
-CONTENTPAL_VERSION=2d16bb5
-ROBOLECTRIC_VERSION=3.1.4
+CONTENTPAL_VERSION=fc8cca91
+ROBOLECTRIC_VERSION=3.1.4
+JEMS_VERSION=1.13
diff --git a/opentasks-provider/build.gradle b/opentasks-provider/build.gradle
@@ -33,7 +33,10 @@ dependencies {
     compile project(':opentasks-contract')
 
     androidTestCompile project(':opentaskspal')
-    androidTestCompile 'com.github.dmfs.contentpal:contenttestpal:' + CONTENTPAL_VERSION
+    androidTestCompile('com.github.dmfs.contentpal:contenttestpal:' + CONTENTPAL_VERSION) {
+        exclude module: 'jems'
+    }
+    compile 'org.dmfs:jems:' + JEMS_VERSION
     androidTestCompile 'com.android.support:support-annotations:' + SUPPORT_LIBRARY_VERSION
     androidTestCompile 'com.android.support.test:runner:0.5'
     androidTestCompile 'com.android.support.test:rules:0.5'

diff --git a/opentasks/build.gradle b/opentasks/build.gradle
@@ -53,12 +53,16 @@ dependencies {
     compile project(':opentasks-provider')
     compile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
     compile 'com.github.dmfs:color-picker:1.0'
-    compile 'au.com.codeka:carrot:2.4.0'
-    compile('com.github.dmfs.androidcarrot:androidcarrot:5a4baa0222') {
+    compile ('au.com.codeka:carrot:2.4.0'){
+        exclude module: 'iterators' // TODO Remove when iterators have been removed from codeka:carrot
+    }
+    compile('com.github.dmfs.androidcarrot:androidcarrot:13edc04') {
         exclude module: 'carrot'
         exclude group: 'com.android.support'
+        exclude module: 'iterators'
+        exclude module: 'jems'
     }
-    compile 'org.dmfs:essentials:1.9'
+    compile 'org.dmfs:jems:' + JEMS_VERSION
 
     testCompile 'junit:junit:4.12'
 }
diff --git a/opentaskspal/build.gradle b/opentaskspal/build.gradle
@@ -16,9 +16,14 @@ android {
 
 dependencies {
     compile project(':opentasks-contract')
-    compile 'com.github.dmfs.contentpal:contentpal:' + CONTENTPAL_VERSION
+    compile('com.github.dmfs.contentpal:contentpal:' + CONTENTPAL_VERSION) {
+        exclude module: 'jems'
+    }
     compile "org.dmfs:rfc5545-datetime:0.2.4"
-    testCompile 'com.github.dmfs.contentpal:contentpal-testing:' + CONTENTPAL_VERSION
+    testCompile('com.github.dmfs.contentpal:contentpal-testing:' + CONTENTPAL_VERSION) {
+        exclude module: 'jems'
+    }
+    compile 'org.dmfs:jems:' + JEMS_VERSION
     testCompile 'org.robolectric:robolectric:' + ROBOLECTRIC_VERSION
     testCompile 'junit:junit:4.12'
     testCompile 'org.mockito:mockito-core:2.10.0'