Be more conservative on updates and fixed tests

evant · Apr 3, 2021 · d49644d · d49644d
1 parent dbc1705
commit d49644d
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 44 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,8 +30,8 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 

diff --git a/bindingcollectionadapter-ktx/build.gradle b/bindingcollectionadapter-ktx/build.gradle
@@ -15,8 +15,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     sourceSets {
         androidTest {
@@ -25,14 +25,14 @@ android {
             }
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
     api project(':bindingcollectionadapter')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 
 apply from: '../publish.gradle'

diff --git a/bindingcollectionadapter-paging/build.gradle b/bindingcollectionadapter-paging/build.gradle
@@ -15,8 +15,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     sourceSets {
         androidTest {
@@ -25,24 +25,23 @@ android {
             }
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
     implementation project(':bindingcollectionadapter-recyclerview')
-    implementation 'androidx.paging:paging-runtime:2.1.2'
+    implementation 'androidx.paging:paging-runtime:2.0.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.assertj:assertj-core:3.6.2'
     testImplementation 'org.mockito:mockito-core:3.3.0'
 
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.0'
-    androidTestImplementation 'androidx.core:core:1.3.2'
 }
 
 apply from: '../publish.gradle'
diff --git a/bindingcollectionadapter-recyclerview/build.gradle b/bindingcollectionadapter-recyclerview/build.gradle
@@ -14,8 +14,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     sourceSets {
         androidTest {
@@ -24,24 +24,23 @@ android {
             }
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
     api project(':bindingcollectionadapter')
-    api 'androidx.recyclerview:recyclerview:1.1.0'
+    api 'androidx.recyclerview:recyclerview:1.0.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.assertj:assertj-core:3.6.2'
     testImplementation 'org.mockito:mockito-core:3.3.0'
 
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.0'
-    androidTestImplementation 'androidx.core:core:1.3.2'
 }
 
 apply from: '../publish.gradle'
diff --git a/bindingcollectionadapter-recyclerview/src/androidTest/AndroidManifest.xml b/bindingcollectionadapter-recyclerview/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,7 @@
-<manifest package="me.tatarka.bindingcollectionadapter2.recyclerview"
-    xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="me.tatarka.bindingcollectionadapter2.recyclerview">
+
+    <uses-sdk android:targetSdkVersion="30" />
 
     <application>
         <activity android:name="me.tatarka.bindingcollectionadapter2.recyclerview.EmptyActivity" />

diff --git a/...w/src/androidTest/java/me/tatarka/bindingcollectionadapter2/recyclerview/TestHelpers.java b/...w/src/androidTest/java/me/tatarka/bindingcollectionadapter2/recyclerview/TestHelpers.java
@@ -2,7 +2,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.DiffUtil;
-import androidx.test.espresso.core.internal.deps.dagger.internal.Factory;
 import androidx.test.espresso.core.internal.deps.guava.base.Joiner;
 
 import java.util.Iterator;
@@ -56,7 +55,7 @@ public static class MyBindingRecyclerViewAdapter<T> extends BindingRecyclerViewA
 
     public static <T> Iterable<T> iterable(final BindingRecyclerViewAdapter<T> adapter) {
         if (adapter == null) return null;
-        return new IndexIterable<>(new Factory<IndexIterator<T>>() {
+        return new IndexIterable<>(new IndexIterable.Factory<IndexIterator<T>>() {
             @Override
             public IndexIterator<T> get() {
                 return new IndexIterator<T>() {
@@ -90,6 +89,10 @@ public Iterator<T> iterator() {
         public String toString() {
             return iterator().toString();
         }
+
+        interface Factory<T> {
+            T get();
+        }
     }
 
     private static abstract class IndexIterator<T> implements Iterator<T> {

diff --git a/bindingcollectionadapter-viewpager2/build.gradle b/bindingcollectionadapter-viewpager2/build.gradle
@@ -14,8 +14,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     sourceSets {
         androidTest {
@@ -24,8 +24,8 @@ android {
             }
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
@@ -34,15 +34,14 @@ dependencies {
     api project(':bindingcollectionadapter-recyclerview')
     api 'androidx.viewpager2:viewpager2:1.0.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.assertj:assertj-core:3.6.2'
     testImplementation 'org.mockito:mockito-core:3.3.0'
 
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     androidTestImplementation 'com.squareup.assertj:assertj-android:1.1.0'
-    androidTestImplementation 'androidx.core:core:1.3.2'
 }
 
 apply from: '../publish.gradle'
diff --git a/bindingcollectionadapter/build.gradle b/bindingcollectionadapter/build.gradle
@@ -14,8 +14,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
     sourceSets {
         androidTest {
@@ -24,16 +24,16 @@ android {
             }
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
-    implementation 'androidx.core:core:1.3.2'
+    implementation 'androidx.core:core:1.0.0'
     implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
     testImplementation 'org.assertj:assertj-core:3.6.2'
     testImplementation 'org.mockito:mockito-core:3.3.0'
 

diff --git a/bindingcollectionadapter/src/androidTest/AndroidManifest.xml b/bindingcollectionadapter/src/androidTest/AndroidManifest.xml
@@ -1,6 +1,8 @@
 <manifest package="me.tatarka.bindingcollectionadapter2"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <uses-sdk android:targetSdkVersion="30" />
+
     <application>
         <activity android:name="me.tatarka.bindingcollectionadapter2.EmptyActivity" />
     </application>

diff --git a/...lectionadapter/src/androidTest/java/me/tatarka/bindingcollectionadapter2/TestHelpers.java b/...lectionadapter/src/androidTest/java/me/tatarka/bindingcollectionadapter2/TestHelpers.java
@@ -1,6 +1,5 @@
 package me.tatarka.bindingcollectionadapter2;
 
-import androidx.test.espresso.core.internal.deps.dagger.internal.Factory;
 import androidx.test.espresso.core.internal.deps.guava.base.Joiner;
 
 import java.util.Iterator;
@@ -80,7 +79,7 @@ public static class MyBindingViewPagerAdapter<T> extends BindingViewPagerAdapter
 
     public static <T> Iterable<T> iterable(final BindingListViewAdapter<T> adapter) {
         if (adapter == null) return null;
-        return new IndexIterable<>(new Factory<IndexIterator<T>>() {
+        return new IndexIterable<>(new IndexIterable.Factory<IndexIterator<T>>() {
             @Override
             public IndexIterator<T> get() {
                 return new IndexIterator<T>() {
@@ -100,7 +99,7 @@ T get(int index) {
 
     public static <T> Iterable<T> iterable(final BindingViewPagerAdapter<T> adapter) {
         if (adapter == null) return null;
-        return new IndexIterable<>(new Factory<IndexIterator<T>>() {
+        return new IndexIterable<>(new IndexIterable.Factory<IndexIterator<T>>() {
             @Override
             public IndexIterator<T> get() {
                 return new IndexIterator<T>() {
@@ -120,7 +119,7 @@ T get(int index) {
 
     public static Iterable<Long> iterableIds(final BindingListViewAdapter<?> adapter) {
         if (adapter == null) return null;
-        return new IndexIterable<>(new Factory<IndexIterator<Long>>() {
+        return new IndexIterable<>(new IndexIterable.Factory<IndexIterator<Long>>() {
             @Override
             public IndexIterator<Long> get() {
                 return new IndexIterator<Long>() {
@@ -140,7 +139,7 @@ Long get(int index) {
 
     public static Iterable<Boolean> iterableIsEnabled(final BindingListViewAdapter<?> adapter) {
         if (adapter == null) return null;
-        return new IndexIterable<>(new Factory<IndexIterator<Boolean>>() {
+        return new IndexIterable<>(new IndexIterable.Factory<IndexIterator<Boolean>>() {
             @Override
             public IndexIterator<Boolean> get() {
                 return new IndexIterator<Boolean>() {
@@ -174,6 +173,10 @@ public Iterator<T> iterator() {
         public String toString() {
             return iterator().toString();
         }
+
+        interface Factory<T> {
+            T get();
+        }
     }
 
     private static abstract class IndexIterator<T> implements Iterator<T> {

diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.4.21'
+    ext.kotlin_version = '1.4.0'
     ext.agp_version = '4.1.2'
     repositories {
         google()

diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,3 @@
 group=me.tatarka.bindingcollectionadapter2
 version=4.0.1
 android.useAndroidX=true
-android.enableJetifier=false