From cbe77f3a7a687ae06b255f2d0b560291616669c6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 30 Mar 2021 13:15:42 +0000 Subject: [PATCH 1/8] Bump kramdown from 2.3.0 to 2.3.1 Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1. - [Release notes](https://github.com/gettalong/kramdown/releases) - [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page) - [Commits](https://github.com/gettalong/kramdown/commits) Signed-off-by: dependabot[bot] --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bbed6e1b..881771cd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -42,7 +42,7 @@ GEM faraday-net_http (1.0.1) git (1.8.1) rchardet (~> 1.8) - kramdown (2.3.0) + kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) From 3a6324d57be654cb5f8c0ed04051f4a0be41e096 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 09:42:11 +0200 Subject: [PATCH 2/8] - ensure we compute the correct location in case of more than 2 child adapters - FIX https://github.com/mikepenz/FastAdapter/issues/988 --- .../src/main/java/com/mikepenz/fastadapter/FastAdapter.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastadapter/src/main/java/com/mikepenz/fastadapter/FastAdapter.kt b/fastadapter/src/main/java/com/mikepenz/fastadapter/FastAdapter.kt index d936b3e2..b3f9db47 100644 --- a/fastadapter/src/main/java/com/mikepenz/fastadapter/FastAdapter.kt +++ b/fastadapter/src/main/java/com/mikepenz/fastadapter/FastAdapter.kt @@ -485,7 +485,7 @@ open class FastAdapter : RecyclerView.Adapter Date: Sat, 6 Feb 2021 13:38:44 +0100 Subject: [PATCH 3/8] - update materialdrawer 8.3.2 - ci pipeline java 11 - disable jetifier - androidx multidex --- .github/workflows/ci.yml | 5 +++++ app/build.gradle | 1 - build.gradle | 6 +----- gradle.properties | 3 ++- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7923cdc6..cb563fba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,11 @@ jobs: with: fetch-depth: 100 + - uses: actions/setup-java@v1 + with: + java-version: '11' + java-package: jdk + - name: Validate gradle wrapper uses: gradle/wrapper-validation-action@v1 diff --git a/app/build.gradle b/app/build.gradle index 272c9040..b71c863a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -169,7 +169,6 @@ dependencies { buildscript { repositories { - google() jcenter() } dependencies { diff --git a/build.gradle b/build.gradle index 96b74bac..e6f12c6e 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ buildscript { cardview : '1.0.0', kotlin : '1.4.30', iconics : '5.2.5', - materialdrawer : '8.3.1', + materialdrawer : '8.3.2', aboutlib : '8.8.1', roboelectric : '4.5.1', detekt : '1.15.0', @@ -39,7 +39,6 @@ buildscript { repositories { google() mavenCentral() - jcenter() maven { url "https://plugins.gradle.org/m2/" } @@ -59,9 +58,6 @@ allprojects { google() mavenCentral() jcenter() - maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } - maven { url "https://jitpack.io" } - maven { url "https://dl.bintray.com/mikepenz/maven" } } } diff --git a/gradle.properties b/gradle.properties index c297ab37..26f5857e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,6 +16,7 @@ POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt POM_LICENCE_DIST=repo POM_DEVELOPER_ID=mikepenz POM_DEVELOPER_NAME=Mike Penz + android.useAndroidX=true -android.enableJetifier=true +android.enableJetifier=false org.gradle.jvmargs=-Xmx4G From 4cfcf073633611f40ec13be4beeae52d7b1fa0f2 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 09:54:19 +0200 Subject: [PATCH 4/8] - more dependency updates - recyclerView 1.2.0 - kotlin 1.4.32 - build tools 4.1.3 - iconics, materialdrawer, aboutlibs, detekt - lifecycle 2.3.1 --- app/build.gradle | 4 +-- build.gradle | 35 ++++++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 24 insertions(+), 17 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b71c863a..3fe2fd84 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -145,7 +145,7 @@ dependencies { //Used to async operations implementation 'io.reactivex.rxjava2:rxandroid:2.1.1' - implementation 'io.reactivex.rxjava2:rxjava:2.2.20' + implementation 'io.reactivex.rxjava2:rxjava:2.2.21' compileOnly "com.google.code.findbugs:jsr305:3.0.2" @@ -172,6 +172,6 @@ buildscript { jcenter() } dependencies { - classpath "io.realm:realm-gradle-plugin:10.3.1" + classpath "io.realm:realm-gradle-plugin:10.4.0" } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index e6f12c6e..adf0ca95 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { ] setup = [ - gradleTools: '4.1.2', + gradleTools: '4.1.3', compileSdk : 30, buildTools : "30.0.2", minSdk : 16, @@ -18,30 +18,28 @@ buildscript { versions = [ androidX : '1.1.0', - recyclerView : '1.1.0', + recyclerView : '1.2.0', material : '1.3.0', appcompat : '1.2.0', drawerlayout : '1.1.0', constraintLayout: '2.0.4', cardview : '1.0.0', - kotlin : '1.4.30', - iconics : '5.2.5', - materialdrawer : '8.3.2', - aboutlib : '8.8.1', + kotlin : '1.4.32', + iconics : '5.2.8', + materialdrawer : '8.4.0', + aboutlib : '8.8.4', roboelectric : '4.5.1', - detekt : '1.15.0', + detekt : '1.16.0', paging : "2.1.2", room : "2.2.6", - lifecycle : "2.2.0" + lifecycle : "2.3.1" ] } repositories { - google() + gradlePluginPortal() mavenCentral() - maven { - url "https://plugins.gradle.org/m2/" - } + google() } dependencies { classpath "com.android.tools.build:gradle:${setup.gradleTools}" @@ -55,9 +53,18 @@ allprojects { group "com.mikepenz" repositories { - google() mavenCentral() - jcenter() + google() + maven { + // (mp) remove when available on maven center + url "https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven" + content { includeGroup "org.jetbrains.kotlinx" } + } + } + + configurations.all { + resolutionStrategy.force "org.jetbrains.kotlinx:kotlinx-html-jvm:0.7.3" + // (mp) remove when available on maven center } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 25d32653..8cf6eb5a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 06c5667469e07af6b2b6bdef9d1ae5cf49d356a8 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 10:11:33 +0200 Subject: [PATCH 5/8] - limit repositories for dependencies --- app/build.gradle | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3fe2fd84..0c5fbbeb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -67,6 +67,23 @@ kapt { generateStubs = true } +repositories { + maven { + url "https://jitpack.io" + content { + includeGroup "com.github.MFlisar" + includeGroup "com.github.turing-tech" + } + } + maven { + url "https://oss.sonatype.org/content/repositories/snapshots/" + content { includeGroup "com.mikepenz.thirdparty" } + } + jcenter() { + content { includeGroup "com.mopub" } + } +} + dependencies { implementation 'androidx.multidex:multidex:2.0.1' @@ -152,9 +169,6 @@ dependencies { implementation "androidx.room:room-runtime:${versions.room}" kapt "androidx.room:room-compiler:${versions.room}" - implementation "androidx.lifecycle:lifecycle-extensions:${versions.lifecycle}" - - configurations.all { resolutionStrategy.force "com.mikepenz:iconics-core:${versions.iconics}" resolutionStrategy.force "com.mikepenz:iconics-views:${versions.iconics}" @@ -169,8 +183,10 @@ dependencies { buildscript { repositories { - jcenter() + mavenCentral() + jcenter() { content { includeGroup "io.realm" } } } + dependencies { classpath "io.realm:realm-gradle-plugin:10.4.0" } From 97b9f1f3e84930fe2c688e1c898731740d1fe376 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 10:16:17 +0200 Subject: [PATCH 6/8] - fix com.mopub.volley --- app/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 0c5fbbeb..8995a930 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,7 +80,10 @@ repositories { content { includeGroup "com.mikepenz.thirdparty" } } jcenter() { - content { includeGroup "com.mopub" } + content { + includeGroup "com.mopub" + includeGroup "com.mopub.volley" + } } } From 2882eb13db744c3efcda290aa3df391ab1694771 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 10:32:43 +0200 Subject: [PATCH 7/8] - we still require jetifier for some super old sample showcase dependencies --- .../com/mikepenz/fastadapter/app/PagedActivity.kt | 11 ++++------- gradle.properties | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/mikepenz/fastadapter/app/PagedActivity.kt b/app/src/main/java/com/mikepenz/fastadapter/app/PagedActivity.kt index 00191d31..821465f6 100755 --- a/app/src/main/java/com/mikepenz/fastadapter/app/PagedActivity.kt +++ b/app/src/main/java/com/mikepenz/fastadapter/app/PagedActivity.kt @@ -3,9 +3,7 @@ package com.mikepenz.fastadapter.app import android.os.Bundle import android.os.Handler import androidx.appcompat.app.AppCompatActivity -import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders -import androidx.paging.PagedList +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.AsyncDifferConfig import androidx.recyclerview.widget.DiffUtil import androidx.recyclerview.widget.LinearLayoutManager @@ -69,12 +67,11 @@ class PagedActivity : AppCompatActivity() { binding.rv.layoutManager = LinearLayoutManager(this) binding.rv.adapter = mFastAdapter - val viewModel = ViewModelProviders.of(this, - DemoEntityViewModel.DemoEntityViewModelFactory(this.application)) - .get(DemoEntityViewModel::class.java) + val viewModel = ViewModelProvider(this, DemoEntityViewModel.DemoEntityViewModelFactory(this.application)) + .get(DemoEntityViewModel::class.java) //listen to data changes and pass it to adapter for displaying in recycler view - viewModel.demoEntitiesList.observe(this, Observer> { t -> mItemAdapter.submitList(t!!) }) + viewModel.demoEntitiesList.observe(this, { t -> mItemAdapter.submitList(t!!) }) //if we do this. the first added items will be animated :D Handler().postDelayed({ diff --git a/gradle.properties b/gradle.properties index 26f5857e..fcaf9d3e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,5 +18,5 @@ POM_DEVELOPER_ID=mikepenz POM_DEVELOPER_NAME=Mike Penz android.useAndroidX=true -android.enableJetifier=false +android.enableJetifier=true org.gradle.jvmargs=-Xmx4G From 70b1380b6e888b9fbfb6bb4357295892ffb1d8a5 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 9 Apr 2021 10:40:45 +0200 Subject: [PATCH 8/8] - [release] v5.4.0 --- README.md | 3 +-- build.gradle | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 79fdc7ab..5131452a 100644 --- a/README.md +++ b/README.md @@ -48,8 +48,7 @@ It's blazing fast, minimizing the code you need to write, and is easy to extend. ## Latest releases 🛠 -- Kotlin Beta | [v5.4.0-b01](https://github.com/mikepenz/FastAdapter/tree/v5.4.0-b01) -- Kotlin | [v5.3.5](https://github.com/mikepenz/FastAdapter/tree/v5.3.5) +- Kotlin | [v5.4.0](https://github.com/mikepenz/FastAdapter/tree/v5.4.0) - Java && AndroidX | [v3.3.1](https://github.com/mikepenz/FastAdapter/tree/v3.3.1) - Java && AppCompat | [v3.2.9](https://github.com/mikepenz/FastAdapter/tree/v3.2.9) diff --git a/build.gradle b/build.gradle index adf0ca95..aba2e61f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { ext { release = [ - versionName: "5.4.0-b01", + versionName: "5.4.0", versionCode: 5040 ]