From 9c347b9d545452a3bd088e4292afa007fa87ef83 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 30 Jul 2021 10:09:26 +0200 Subject: [PATCH 1/8] - remove EXPERIMENTAL note on compose support --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74e44405..6b06b599 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ - Auto mirroring for RTL (opt-in) - If it takes a Drawable, it will also work with the IconicsDrawable! - Save in APK size -- [EXPERIMENTAL] Compose support +- Compose support **Already available fonts** - [Google Material Design Icons](https://github.com/google/material-design-icons) From 54666ef44510c823be7fb44d6776d8a0d4e786c7 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Mon, 30 Aug 2021 11:07:58 +0200 Subject: [PATCH 2/8] - republish google-material-typeface 4.0.0.1 as 4.0.0.2 --- README.md | 2 +- .../google-material-typeface-library/build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6b06b599..51e06037 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ implementation "com.mikepenz:iconics-views:${latestAndroidIconicsRelease}" > Note: v5.1.x or newer requires the latest font versions ```gradle -implementation 'com.mikepenz:google-material-typeface:4.0.0.1-kotlin@aar' +implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar' implementation 'com.mikepenz:google-material-typeface-{outlined|rounded|sharp}:4.0.0.1-kotlin@aar' implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar' implementation 'com.mikepenz:fontawesome-typeface:5.9.0.2-kotlin@aar' diff --git a/google-material-typeface/google-material-typeface-library/build.gradle b/google-material-typeface/google-material-typeface-library/build.gradle index eab1a6d0..f1245983 100644 --- a/google-material-typeface/google-material-typeface-library/build.gradle +++ b/google-material-typeface/google-material-typeface-library/build.gradle @@ -26,8 +26,8 @@ android { minSdkVersion setup.minSdk targetSdkVersion setup.targetSdk consumerProguardFiles 'consumer-proguard-rules.pro' - versionCode 40001 - versionName "4.0.0.1-kotlin" + versionCode 40002 + versionName "4.0.0.2-kotlin" resValue "string", "googlematerial_version", "${versionName}" } From 798fe9ef3c468391299fd45f3f21e2f602d9a440 Mon Sep 17 00:00:00 2001 From: Carlos <2092019+CarlosEsco@users.noreply.github.com> Date: Wed, 8 Sep 2021 13:28:00 -0400 Subject: [PATCH 3/8] Fix readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 51e06037..1235e2d0 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ implementation 'com.mikepenz:foundation-icons-typeface:3.0.0.7-kotlin@aar' implementation 'com.mikepenz:ionicons-typeface:2.0.1.7-kotlin@aar' implementation 'com.mikepenz:pixeden-7-stroke-typeface:1.2.0.5-kotlin@aar' implementation 'com.mikepenz:material-design-icons-dx-typeface:5.0.1.2-kotlin@aar' -implementation 'com.mikepenz:phosphor-typeface:1.0.0.0-kotlinn@aar' +implementation 'com.mikepenz:phosphor-typeface:1.0.0.0-kotlin@aar' ``` # Usage From 9dfb870553e8dfd9a2e2bcb8d1cdc2cf908567b0 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 17 Sep 2021 11:48:50 +0200 Subject: [PATCH 4/8] - upgrade dependencies to latest stable version - compose 1.0.2 - kotlin 1.5.20 - build tools 31.0.0 - compileSdk 31 - startup 1.1.0 - detekt 1.18.1 - materialDrawer 8.4.3 - fastAdapter 5.5.1 --- build.gradle | 18 +++++++++--------- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index c56b40b1..e1a1d752 100644 --- a/build.gradle +++ b/build.gradle @@ -23,15 +23,15 @@ buildscript { ] setup = [ - compileSdk : 30, - buildTools : "30.0.3", + compileSdk : 31, + buildTools : "31.0.0", minSdk : 16, composeMinSdk: 21, targetSdk : 30 ] versions = [ - kotlin : '1.5.10', + kotlin : '1.5.20', androidX : '1.0.0', recyclerView : '1.2.1', material : '1.4.0', @@ -42,13 +42,13 @@ buildscript { ktx : [ core: '1.6.0' ], - startup : '1.0.0', - detekt : '1.16.0', + startup : '1.1.0', + detekt : '1.18.1', aboutLibraries : '8.9.1', - materialDrawer : '8.4.2', - fastAdapter : '5.4.1', + materialDrawer : '8.4.3', + fastAdapter : '5.5.1', // compose - compose : '1.0.0' + compose : '1.0.2' ] } @@ -62,7 +62,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.1.0-alpha05' + classpath 'com.android.tools.build:gradle:7.1.0-alpha12' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}" classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${versions.detekt}" classpath "com.mikepenz.aboutlibraries.plugin:aboutlibraries-plugin:${versions.aboutLibraries}" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1acc777d..a0f7639f 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-7.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 431d2b67cb889da9f7854bde4d2ce00ae4ebb474 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 17 Sep 2021 11:57:22 +0200 Subject: [PATCH 5/8] - use compose compatible kotlin --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e1a1d752..ab124a3e 100644 --- a/build.gradle +++ b/build.gradle @@ -31,7 +31,7 @@ buildscript { ] versions = [ - kotlin : '1.5.20', + kotlin : '1.5.21', androidX : '1.0.0', recyclerView : '1.2.1', material : '1.4.0', From 900ae931327be8380705533e8c68014fe0381ee8 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 17 Sep 2021 11:51:01 +0200 Subject: [PATCH 6/8] - the compose extension is now stable, remove experimental api --- .../com/mikepenz/iconics/compose/ExperimentalIconics.kt | 5 ----- .../java/com/mikepenz/iconics/compose/IconicsPainter.kt | 7 +++++-- .../src/main/java/com/mikepenz/iconics/compose/Image.kt | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) delete mode 100644 iconics-compose/src/main/java/com/mikepenz/iconics/compose/ExperimentalIconics.kt diff --git a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/ExperimentalIconics.kt b/iconics-compose/src/main/java/com/mikepenz/iconics/compose/ExperimentalIconics.kt deleted file mode 100644 index 399b1a18..00000000 --- a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/ExperimentalIconics.kt +++ /dev/null @@ -1,5 +0,0 @@ -package com.mikepenz.iconics.compose - -// Notify user that the compose API is currently experimental -@RequiresOptIn(level = RequiresOptIn.Level.WARNING) -annotation class ExperimentalIconics \ No newline at end of file diff --git a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/IconicsPainter.kt b/iconics-compose/src/main/java/com/mikepenz/iconics/compose/IconicsPainter.kt index 18be5a4c..36aaca19 100644 --- a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/IconicsPainter.kt +++ b/iconics-compose/src/main/java/com/mikepenz/iconics/compose/IconicsPainter.kt @@ -8,7 +8,11 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.compose.ui.geometry.Size -import androidx.compose.ui.graphics.* +import androidx.compose.ui.graphics.Brush +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.ColorFilter +import androidx.compose.ui.graphics.SolidColor +import androidx.compose.ui.graphics.asComposePath import androidx.compose.ui.graphics.drawscope.DrawScope import androidx.compose.ui.graphics.painter.Painter import com.mikepenz.iconics.typeface.IIcon @@ -24,7 +28,6 @@ data class IconicsConfig( val iconOffsetYPx: Int = 0 ) -@ExperimentalIconics data class IconicsPainter( private val image: IIcon, private val config: IconicsConfig = IconicsConfig() diff --git a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/Image.kt b/iconics-compose/src/main/java/com/mikepenz/iconics/compose/Image.kt index 1f428878..08768004 100644 --- a/iconics-compose/src/main/java/com/mikepenz/iconics/compose/Image.kt +++ b/iconics-compose/src/main/java/com/mikepenz/iconics/compose/Image.kt @@ -31,7 +31,6 @@ import com.mikepenz.iconics.typeface.IIcon * @param colorFilter Optional ColorFilter to apply for the [ImageAsset] when it is rendered * onscreen */ -@ExperimentalIconics @Suppress("NOTHING_TO_INLINE") @Composable @SuppressLint("ModifierParameter") From 9a896d41c6dcac883727a5608f34260032faa9c3 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 17 Sep 2021 12:36:30 +0200 Subject: [PATCH 7/8] - remove jcenter repo --- build.gradle | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.gradle b/build.gradle index ab124a3e..89579085 100644 --- a/build.gradle +++ b/build.gradle @@ -55,7 +55,6 @@ buildscript { repositories { google() mavenCentral() - jcenter() maven { url "https://plugins.gradle.org/m2/" } @@ -75,7 +74,6 @@ allprojects { repositories { google() mavenCentral() - jcenter() maven { url "https://oss.sonatype.org/content/repositories/snapshots/" } } } From 854bf38c6674e70f9e2c278166693d31dde8b995 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Fri, 17 Sep 2021 12:44:15 +0200 Subject: [PATCH 8/8] - [release] v5.3.1 --- README.md | 2 +- build.gradle | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1235e2d0..5e23780c 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ ## Latest releases 🛠 -- Kotlin Next Gen | [v5.3.0](https://github.com/mikepenz/Android-Iconics/tree/v5.3.0) +- Kotlin Next Gen | [v5.3.1](https://github.com/mikepenz/Android-Iconics/tree/v5.3.1) - Kotlin | [v4.0.2](https://github.com/mikepenz/Android-Iconics/tree/v4.0.2) - Java AndroidX | [v3.2.5](https://github.com/mikepenz/Android-Iconics/tree/v3.2.5) - Java Appcompat | [v3.0.4](https://github.com/mikepenz/Android-Iconics/tree/v3.0.4) diff --git a/build.gradle b/build.gradle index 89579085..a4e9e4a9 100644 --- a/build.gradle +++ b/build.gradle @@ -18,8 +18,8 @@ buildscript { ext { release = [ - versionName: "5.3.0", - versionCode: 50300 + versionName: "5.3.1", + versionCode: 50301 ] setup = [