Merge pull request #602 from mikepenz/develop

dev -> main

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)
@@ -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)
@@ -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'
@@ -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

build.gradle

@@ -18,20 +18,20 @@ buildscript {
 
     ext {
         release = [
-                versionName: "5.3.0",
-                versionCode: 50300
+                versionName: "5.3.1",
+                versionCode: 50301
         ]
 
         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.21',
                 androidX        : '1.0.0',
                 recyclerView    : '1.2.1',
                 material        : '1.4.0',
@@ -42,27 +42,26 @@ 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'
         ]
     }
 
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven {
             url "https://plugins.gradle.org/m2/"
         }
     }
 
     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}"
@@ -75,7 +74,6 @@ allprojects {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }

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}"
     }

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

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()

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")