From 0e8c27eeb8dfc5daaf619322be275d22c4cd96f0 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 16:40:32 -0700 Subject: Fix blur and deps --- sample/build.gradle | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'sample') diff --git a/sample/build.gradle b/sample/build.gradle index 9f2162f..ff25f50 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,4 +1,5 @@ import kau.Dependencies +import kau.Versions apply plugin: 'com.android.application' apply plugin: 'kotlin-android' @@ -15,7 +16,7 @@ play { } android { - compileSdkVersion kau.Versions.targetSdk + compileSdkVersion Versions.targetSdk androidGitVersion { codeFormat = 'MMNNPPXX' @@ -24,8 +25,8 @@ android { defaultConfig { applicationId "ca.allanwang.kau.sample" - minSdkVersion kau.Versions.minSdk - targetSdkVersion kau.Versions.targetSdk + minSdkVersion Versions.minSdk + targetSdkVersion Versions.targetSdk versionName androidGitVersion.name() versionCode androidGitVersion.code() multiDexEnabled true @@ -90,12 +91,12 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility Versions.java + targetCompatibility Versions.java } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = Versions.java.toString() } sourceSets { -- cgit v1.2.3 From 2ae078cedca3516a60d88d7157ab1612def32972 Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sun, 29 Aug 2021 21:49:16 -0700 Subject: Remove iconics google from dep api --- core/build.gradle | 2 +- mediapicker/build.gradle | 2 ++ sample/build.gradle | 2 ++ searchview/build.gradle | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) (limited to 'sample') diff --git a/core/build.gradle b/core/build.gradle index 0f9bd5e..57ad8fe 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,7 +14,7 @@ dependencies { api kau.Dependencies.coroutines api kau.Dependencies.iconics - api kau.Dependencies.iconicsGoogle + implementation kau.Dependencies.iconicsGoogle api kau.Dependencies.materialDialog } diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle index 06a18d0..12fa56a 100644 --- a/mediapicker/build.gradle +++ b/mediapicker/build.gradle @@ -7,6 +7,8 @@ dependencies { implementation project(':core-ui') implementation project(':fastadapter') + implementation kau.Dependencies.iconicsGoogle + api kau.Dependencies.glide api kau.Dependencies.blurry } diff --git a/sample/build.gradle b/sample/build.gradle index ff25f50..c2682e7 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -132,6 +132,8 @@ dependencies { implementation project(':searchview') implementation project(':mediapicker') + implementation Dependencies.iconicsGoogle + implementation Dependencies.hilt kapt Dependencies.hiltCompiler diff --git a/searchview/build.gradle b/searchview/build.gradle index 64a88b3..13a3829 100644 --- a/searchview/build.gradle +++ b/searchview/build.gradle @@ -7,6 +7,8 @@ apply from: '../android-lib.gradle' dependencies { implementation project(':core-ui') implementation project(':fastadapter') + + implementation kau.Dependencies.iconicsGoogle } apply from: '../artifacts.gradle' -- cgit v1.2.3 From 0c0cc7776a6b21bb6c8c83f74619ea6660429f2c Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Mon, 30 Aug 2021 01:33:49 -0700 Subject: Revert iconics api removal --- .idea/runConfigurations.xml | 10 ---------- core/build.gradle | 2 +- mediapicker/build.gradle | 2 -- sample/build.gradle | 2 -- searchview/build.gradle | 2 -- 5 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 .idea/runConfigurations.xml (limited to 'sample') diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 797acea..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 57ad8fe..0f9bd5e 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,7 +14,7 @@ dependencies { api kau.Dependencies.coroutines api kau.Dependencies.iconics - implementation kau.Dependencies.iconicsGoogle + api kau.Dependencies.iconicsGoogle api kau.Dependencies.materialDialog } diff --git a/mediapicker/build.gradle b/mediapicker/build.gradle index 12fa56a..06a18d0 100644 --- a/mediapicker/build.gradle +++ b/mediapicker/build.gradle @@ -7,8 +7,6 @@ dependencies { implementation project(':core-ui') implementation project(':fastadapter') - implementation kau.Dependencies.iconicsGoogle - api kau.Dependencies.glide api kau.Dependencies.blurry } diff --git a/sample/build.gradle b/sample/build.gradle index c2682e7..ff25f50 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -132,8 +132,6 @@ dependencies { implementation project(':searchview') implementation project(':mediapicker') - implementation Dependencies.iconicsGoogle - implementation Dependencies.hilt kapt Dependencies.hiltCompiler diff --git a/searchview/build.gradle b/searchview/build.gradle index 13a3829..64a88b3 100644 --- a/searchview/build.gradle +++ b/searchview/build.gradle @@ -7,8 +7,6 @@ apply from: '../android-lib.gradle' dependencies { implementation project(':core-ui') implementation project(':fastadapter') - - implementation kau.Dependencies.iconicsGoogle } apply from: '../artifacts.gradle' -- cgit v1.2.3 From f406b888ff2108dee310260c29af8c3c2cce4f2d Mon Sep 17 00:00:00 2001 From: Allan Wang Date: Sat, 11 Sep 2021 13:44:13 -0700 Subject: Update changelog --- docs/Changelog.md | 7 ++++++- sample/src/main/res/xml/kau_changelog.xml | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) (limited to 'sample') diff --git a/docs/Changelog.md b/docs/Changelog.md index a4e3621..8320c7e 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,7 +1,12 @@ # Changelog +## v6.3.0 +* Add support for Arctic Fox 2020.3.1 +* Move to new maven release system +* Many version bumps + ## v6.2.0 -* Add support for Android 4.2 +* Add support for Android Studio 4.2 * Remove all usages of kotlin synthetics * Many version bumps * Added Hilt dep diff --git a/sample/src/main/res/xml/kau_changelog.xml b/sample/src/main/res/xml/kau_changelog.xml index c1648b0..2d47332 100644 --- a/sample/src/main/res/xml/kau_changelog.xml +++ b/sample/src/main/res/xml/kau_changelog.xml @@ -6,8 +6,13 @@ --> + + + + + - + -- cgit v1.2.3