Merge branch 'release/v3.2.5'

mikepenz · Apr 1, 2018 · 2615ceb · 2615ceb
2 parents 3ed6ea3 + 48127b3
commit 2615ceb
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 43 deletions.
diff --git a/README.md b/README.md
@@ -41,29 +41,29 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 
 The library is split up into core, commons, and extensions. The core functions are included in the following dependency.
 ```gradle
-implementation 'com.mikepenz:fastadapter:3.2.4@aar'
+implementation 'com.mikepenz:fastadapter:3.2.5'
 implementation  'com.android.support:appcompat-v7:${latestSupportLib}'
 implementation  'com.android.support:recyclerview-v7:${latestSupportLib}'
 ```
 
 The commons package comes with some useful helpers (which are not needed in all cases) This one for example includes the `FastItemAdapter`
 ```gradle
-implementation 'com.mikepenz:fastadapter-commons:3.2.4@aar'
+implementation 'com.mikepenz:fastadapter-commons:3.2.5'
 ```
 
 Expandable support is included and can be added via this
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.4@aar'
+implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.5'
 //The tiny Materialize library used for its useful helper classes
-implementation 'com.mikepenz:materialize:${latestVersion}@aar'
+implementation 'com.mikepenz:materialize:${latestVersion}'
 ```
 
 Many helper classes are included in the following dependency. (This functionality also needs the `Expandable` extension
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions:3.2.4@aar'
+implementation 'com.mikepenz:fastadapter-extensions:3.2.5'
 implementation  'com.android.support:design:${versions.supportLib}'
 //The tiny Materialize library used for its useful helper classes
-implementation 'com.mikepenz:materialize:${latestVersion}@aar'
+implementation 'com.mikepenz:materialize:${latestVersion}'
 ```
 
 ## v3.0.x
@@ -177,9 +177,9 @@ fastItemAdapter.withEventHook(new ClickEventHook<SampleItem>() {
 ### 5. Filter 
 ```java
 // Call this in onQueryTextSubmit() & onQueryTextChange() when using SearchView
-fastAdapter.filter("yourSearchTerm");
+itemAdapter.filter("yourSearchTerm");
 
-fastAdapter.getItemFilter().withFilterPredicate(new IItemAdapter.Predicate<Item>() {
+itemAdapter.getItemFilter().withFilterPredicate(new IItemAdapter.Predicate<Item>() {
     @Override
     public boolean filter(Item item, CharSequence constraint) {
 	return item.getName().startsWith(String.valueOf(constraint));

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3240
-        versionName '3.2.4'
+        versionCode 3250
+        versionName '3.2.5'
 
         setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
     }
@@ -61,21 +61,21 @@ dependencies {
     // used to provide out of the box icon font support. simplifies development,
     // and provides scalable icons. the core is very very light
     // https://github.com/mikepenz/Android-Iconics
-    implementation 'com.mikepenz:iconics-core:3.0.1@aar'
-    implementation "com.mikepenz:iconics-views:3.0.1@aar"
+    implementation 'com.mikepenz:iconics-core:3.0.3@aar'
+    implementation "com.mikepenz:iconics-views:3.0.3@aar"
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:6.0.0@aar') {
+    implementation('com.mikepenz:materialdrawer:6.0.0@aar') {
         transitive = true
         exclude group: "com.mikepenz"
     }
     //used to provide different itemAnimators for the RecyclerView
     //https://github.com/mikepenz/ItemAnimators
-    implementation 'com.mikepenz:itemanimators:1.0.1@aar'
+    implementation 'com.mikepenz:itemanimators:1.0.2@aar'
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
-    compile('com.mikepenz:aboutlibraries:6.0.0@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.0.7@aar') {
         transitive = true
         exclude group: "com.mikepenz"
     }
@@ -108,7 +108,7 @@ dependencies {
     implementation 'com.github.MFlisar:DragSelectRecyclerView:0.2'
 
     //mopub sdk to showcase the usage of the mopub adapter
-    compile('com.mopub:mopub-sdk:4.7.1@aar') {
+    implementation('com.mopub:mopub-sdk:4.7.1@aar') {
         transitive = true
         exclude group: "com.google.android.exoplayer"
     }

diff --git a/build.gradle b/build.gradle
@@ -3,13 +3,13 @@ buildscript {
     ext {
         setup = [
                 compileSdk: 27,
-                buildTools: "27.0.2",
+                buildTools: "27.0.3",
                 minSdk    : 14,
                 targetSdk : 27
         ]
 
         versions = [
-                supportLib: "27.0.2"
+                supportLib: "27.1.0"
         ]
     }
 
@@ -18,8 +18,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
-        classpath 'com.novoda:bintray-release:0.7.0'
+        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.novoda:bintray-release:0.8.1'
         classpath "io.realm:realm-gradle-plugin:4.1.1"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group "com.mikepenz"
-version "3.2.4"
+version "3.2.5"
 
 android {
     compileSdkVersion setup.compileSdk
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3240
-        versionName '3.2.4'
+        versionCode 3250
+        versionName '3.2.5'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
 
@@ -40,5 +40,5 @@ dependencies {
     implementation  "com.android.support:appcompat-v7:${versions.supportLib}"
     implementation  "com.android.support:recyclerview-v7:${versions.supportLib}"
     implementation  "com.android.support:support-annotations:${versions.supportLib}"
-    provided "com.google.code.findbugs:jsr305:3.0.2"
+    compileOnly "com.google.code.findbugs:jsr305:3.0.2"
 }
diff --git a/library-core/gradle.properties b/library-core/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter
 POM_PACKAGING=aar
-VERSION_NAME=3.2.4
-VERSION_CODE=3240
+VERSION_NAME=3.2.5
+VERSION_CODE=3250
diff --git a/library-extensions-expandable/build.gradle b/library-extensions-expandable/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3240
-        versionName '3.2.4'
+        versionCode 3250
+        versionName '3.2.5'
     }
     buildTypes {
         release {
@@ -39,7 +39,7 @@ dependencies {
     implementation  "com.android.support:recyclerview-v7:${versions.supportLib}"
     implementation  "com.android.support:support-annotations:${versions.supportLib}"
 
-    provided "com.google.code.findbugs:jsr305:3.0.2"
+    compileOnly "com.google.code.findbugs:jsr305:3.0.2"
 
     testImplementation  'junit:junit:4.12'
     testImplementation  'org.mockito:mockito-all:1.10.19'
@@ -50,7 +50,7 @@ dependencies {
     testImplementation  'com.squareup.assertj:assertj-android:1.1.1'
     testImplementation  'com.squareup.assertj:assertj-android-design:1.1.1@aar'
     testImplementation  'com.squareup.assertj:assertj-android-appcompat-v7:1.1.1@aar'
-    testCompile("com.squareup.assertj:assertj-android-support-v4:1.1.1@aar") {
+    testImplementation("com.squareup.assertj:assertj-android-support-v4:1.1.1@aar") {
         exclude group: "com.android.support", module: "support-annotations"
         exclude group: "com.android.support", module: "support-v4"
     }

diff --git a/library-extensions-expandable/gradle.properties b/library-extensions-expandable/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library-Extensions-Expandable
 POM_ARTIFACT_ID=fastadapter-extensions-expandable
 POM_PACKAGING=aar
-VERSION_NAME=3.2.4
-VERSION_CODE=3240
+VERSION_NAME=3.2.5
+VERSION_CODE=3250
diff --git a/library-extensions/build.gradle b/library-extensions/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3240
-        versionName '3.2.4'
+        versionCode 3250
+        versionName '3.2.5'
 
         consumerProguardFiles 'consumer-proguard-rules.pro'
     }
@@ -42,5 +42,5 @@ dependencies {
     implementation  "com.android.support:design:${versions.supportLib}"
     implementation  "com.android.support:support-annotations:${versions.supportLib}"
 
-    implementation  'com.mikepenz:materialize:1.1.2@aar'
+    implementation  'com.mikepenz:materialize:1.1.2'
 }
diff --git a/library-extensions/gradle.properties b/library-extensions/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library-Extensions
 POM_ARTIFACT_ID=fastadapter-extensions
 POM_PACKAGING=aar
-VERSION_NAME=3.2.4
-VERSION_CODE=3240
+VERSION_NAME=3.2.5
+VERSION_CODE=3250
diff --git a/library/build.gradle b/library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3240
-        versionName '3.2.4'
+        versionCode 3250
+        versionName '3.2.5'
     }
     buildTypes {
         release {
@@ -47,7 +47,7 @@ dependencies {
     testImplementation  'com.squareup.assertj:assertj-android:1.1.1'
     testImplementation  'com.squareup.assertj:assertj-android-design:1.1.1@aar'
     testImplementation  'com.squareup.assertj:assertj-android-appcompat-v7:1.1.1@aar'
-    testCompile("com.squareup.assertj:assertj-android-support-v4:1.1.1@aar") {
+    testImplementation("com.squareup.assertj:assertj-android-support-v4:1.1.1@aar") {
         exclude group: "com.android.support", module: "support-annotations"
         exclude group: "com.android.support", module: "support-v4"
     }

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -1,5 +1,5 @@
 POM_NAME=FastAdapter Library
 POM_ARTIFACT_ID=fastadapter-commons
 POM_PACKAGING=aar
-VERSION_NAME=3.2.4
-VERSION_CODE=3240
+VERSION_NAME=3.2.5
+VERSION_CODE=3250