aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAllan Wang <me@allanwang.ca>2019-09-14 19:01:33 -0700
committerAllan Wang <me@allanwang.ca>2019-09-14 19:01:33 -0700
commiteafb4881cc6c33d7ae94b1f1e1b5b34fb18ebd03 (patch)
treea4340255cb7bf74d0f56cc00d097ab06748faded
parentc7f2361ab63c45c8b6a370b6ab711dc7f398a4cf (diff)
downloadkau-eafb4881cc6c33d7ae94b1f1e1b5b34fb18ebd03.tar.gz
kau-eafb4881cc6c33d7ae94b1f1e1b5b34fb18ebd03.tar.bz2
kau-eafb4881cc6c33d7ae94b1f1e1b5b34fb18ebd03.zip
Revert about library to older variant
-rw-r--r--about/build.gradle1
-rw-r--r--about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt10
-rw-r--r--buildSrc/src/main/kotlin/kau/Versions.kt2
-rw-r--r--docs/Changelog.md1
-rw-r--r--fastadapter/build.gradle2
-rw-r--r--kpref-activity/build.gradle2
-rw-r--r--sample/src/main/res/xml/kau_changelog.xml1
7 files changed, 9 insertions, 10 deletions
diff --git a/about/build.gradle b/about/build.gradle
index 114428b..274ef5c 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -11,7 +11,6 @@ android {
dependencies {
implementation project(':core-ui')
implementation project(':fastadapter')
- implementation Dependencies.fastAdapter("utils")
api Dependencies.aboutLibraries
}
diff --git a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
index b12ad0e..7ba7811 100644
--- a/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
+++ b/about/src/main/kotlin/ca/allanwang/kau/about/AboutActivityBase.kt
@@ -148,11 +148,11 @@ abstract class AboutActivityBase(
open fun getLibraries(libs: Libs): List<Library> =
libs.prepareLibraries(
this,
- emptyArray(),
- emptyArray(),
- autoDetect = true,
- checkCachedDetection = true,
- sort = true
+ null,
+ null,
+ true,
+ true,
+ true
)
/*
diff --git a/buildSrc/src/main/kotlin/kau/Versions.kt b/buildSrc/src/main/kotlin/kau/Versions.kt
index b4b08b0..3c54625 100644
--- a/buildSrc/src/main/kotlin/kau/Versions.kt
+++ b/buildSrc/src/main/kotlin/kau/Versions.kt
@@ -30,7 +30,7 @@ object Versions {
const val coroutines = "1.3.1"
// https://github.com/mikepenz/AboutLibraries/releases
- const val aboutLibraries = "7.0.3"
+ const val aboutLibraries = "6.2.3"
// https://github.com/wasabeef/Blurry/releases
const val blurry = "3.0.0"
diff --git a/docs/Changelog.md b/docs/Changelog.md
index f76fbe4..0078430 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -2,7 +2,6 @@
## v5.2.0
* :fastadapter: Migrate fastadapter to v4.x.x
-* :fastadapter: Remove fastadapter utils from api
## v5.1.0
* :adapter: Moved fastadapter elements to new module, :fastadapter:. To migrate, simply rename the dependency. If you don't use fast adapter, no changes are necessary
diff --git a/fastadapter/build.gradle b/fastadapter/build.gradle
index 0fbcce9..8abe566 100644
--- a/fastadapter/build.gradle
+++ b/fastadapter/build.gradle
@@ -10,8 +10,8 @@ dependencies {
api project(':adapter')
api Dependencies.fastAdapter
+ api Dependencies.fastAdapter("utils")
implementation Dependencies.fastAdapter("diff")
- implementation Dependencies.fastAdapter("utils")
}
apply from: '../artifacts.gradle'
diff --git a/kpref-activity/build.gradle b/kpref-activity/build.gradle
index 5cce460..7df08d3 100644
--- a/kpref-activity/build.gradle
+++ b/kpref-activity/build.gradle
@@ -1,3 +1,5 @@
+import kau.Dependencies
+
ext.kauSubModuleMinSdk = kau.Versions.coreMinSdk
ext.kauSubModuleResourcePrefix = "kau_pref_"
diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml
index 82d27c2..5fee3cb 100644
--- a/sample/src/main/res/xml/kau_changelog.xml
+++ b/sample/src/main/res/xml/kau_changelog.xml
@@ -8,7 +8,6 @@
<version title="v5.2.0" />
<item text=":fastadapter: Migrate fastadapter to v4.x.x" />
- <item text=":fastadapter: Remove fastadapter utils from api" />
<item text="" />
<version title="v5.1.0" />