Merge branch 'release/v3.1.0-rc02'

MIGRATION.md

@@ -2,6 +2,14 @@
 
 ### Library
 
+#### Community Material Icons > v2.7.94
+* With the update of the community material icons, the amount of icons exceeded the allowed length of an enum. Thus it was split up in `CommunityMaterial.Icon` and `CommunityMaterial.Icon2` if you use the icons via code, please use the depending enum.
+  * The icons were split apart by the letter `h`. All icons starting from `a` to `g` are in the `CommunityMaterial.Icon` enum, all icons from `h` to `z` are in the `CommunityMaterial.Icon2` enum.
+
+#### v3.1.x
+* Upgraded the library to use `androidX` dependencies. This means your project will need to depend on `androidX` dependencies too. If you still use appcompat please consider using a version older than v3.1.x. 
+* Further details about migrating to androidX and a overview can be found on the official docs. https://developer.android.com/topic/libraries/support-library/refactor
+
 #### 2.9.5
 * the attributes for the `IconicsMenuInflaterUtil` start now with `ico_` instead of `iiv_`
 * the `IconicsMenuInflaterUtil` was moved into the `core` module to simplify code

README.md

@@ -77,19 +77,19 @@ To use appcompat please use a version smaller than 3.1.0. (See the releases on G
 
 ## 2. Choose your desired fonts
 ```gradle
-implementation 'com.mikepenz:google-material-typeface:3.0.1.2.original@aar'
-implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.4@aar'
-implementation 'com.mikepenz:fontawesome-typeface:5.0.13.0@aar'
-implementation 'com.mikepenz:octicons-typeface:3.2.0.4@aar'
-implementation 'com.mikepenz:meteocons-typeface:1.1.0.4@aar'
-implementation 'com.mikepenz:community-material-typeface:2.0.46.1@aar'
-implementation 'com.mikepenz:weather-icons-typeface:2.0.10.4@aar'
-implementation 'com.mikepenz:typeicons-typeface:2.0.7.4@aar'
-implementation 'com.mikepenz:entypo-typeface:1.0.0.4@aar'
-implementation 'com.mikepenz:devicon-typeface:2.0.0.4@aar'
-implementation 'com.mikepenz:foundation-icons-typeface:3.0.0.4@aar'
-implementation 'com.mikepenz:ionicons-typeface:2.0.1.4@aar'
-implementation 'com.mikepenz:pixeden-7-stroke-typeface:1.2.0.2@aar'
+implementation 'com.mikepenz:google-material-typeface:3.0.1.3.original@aar'
+implementation 'com.mikepenz:material-design-iconic-typeface:2.2.0.5@aar'
+implementation 'com.mikepenz:fontawesome-typeface:5.3.1.1@aar'
+implementation 'com.mikepenz:octicons-typeface:3.2.0.5@aar'
+implementation 'com.mikepenz:meteocons-typeface:1.1.0.5@aar'
+implementation 'com.mikepenz:community-material-typeface:2.7.94.1@aar'
+implementation 'com.mikepenz:weather-icons-typeface:2.0.10.5@aar'
+implementation 'com.mikepenz:typeicons-typeface:2.0.7.5@aar'
+implementation 'com.mikepenz:entypo-typeface:1.0.0.5@aar'
+implementation 'com.mikepenz:devicon-typeface:2.0.0.5@aar'
+implementation 'com.mikepenz:foundation-icons-typeface:3.0.0.5@aar'
+implementation 'com.mikepenz:ionicons-typeface:2.0.1.5@aar'
+implementation 'com.mikepenz:pixeden-7-stroke-typeface:1.2.0.3@aar'
 ```
 
 ## 3. Define IconicsLayoutInflater to enable automatic xml icons detection (optional)

app/build.gradle

@@ -68,13 +68,13 @@ dependencies {
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items
     // https://github.com/mikepenz/FastAdapter
-    implementation 'com.mikepenz:fastadapter:3.2.8@aar'
-    implementation 'com.mikepenz:fastadapter-commons:3.2.8@aar'
-    implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.8@aar'
+    implementation 'com.mikepenz:fastadapter:3.3.0-rc01'
+    implementation 'com.mikepenz:fastadapter-commons:3.3.0-rc01'
+    implementation 'com.mikepenz:fastadapter-extensions-expandable:3.3.0-rc01'
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    implementation('com.mikepenz:materialdrawer:6.0.7@aar') {
+    implementation('com.mikepenz:materialdrawer:6.1.0-rc01') {
         transitive = true
         exclude module: "fastadapter"
         exclude module: "fastadapter-extensions-expandable"
@@ -84,7 +84,7 @@ dependencies {
 
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    implementation('com.mikepenz:aboutlibraries:6.0.9@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.2.0-rc01') {
         transitive = true
         exclude module: "fastadapter"
         exclude module: "iconics-core"

build.gradle

@@ -1,7 +1,7 @@
 buildscript {
     ext {
         release = [
-                versionName: "3.1.0-rc01",
+                versionName: "3.1.0-rc02",
                 versionCode: 3100
         ]
 
@@ -13,7 +13,7 @@ buildscript {
         ]
 
         versions = [
-                androidXVersion: '1.0.0-rc01'
+                androidXVersion: '1.0.0-rc02'
         ]
     }
 
@@ -23,7 +23,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-alpha05'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha10'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }

community-material-typeface-library/build.gradle

@@ -25,8 +25,10 @@ android {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
         consumerProguardFiles 'consumer-proguard-rules.pro'
-        versionCode 20461
-        versionName "2.0.46.1"
+        versionCode 27941
+        versionName "2.7.94.1"
+
+        resValue "string", "community_material_version", "${versionName}"
     }
     buildTypes {
         release {