Merge pull request #550 from mikepenz/develop

dev -> main
mikepenz · Dec 28, 2020 · 6232336 · 6232336
2 parents 68dd33e + c643d3a
commit 6232336
Show file tree

Hide file tree

Showing 40 changed files with 5,554 additions and 91 deletions.
diff --git a/README.md b/README.md
@@ -50,7 +50,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin Next Gen | [v5.2.1](https://github.com/mikepenz/Android-Iconics/tree/v5.2.1)
+- Kotlin Next Gen | [v5.2.2](https://github.com/mikepenz/Android-Iconics/tree/v5.2.2)
 - 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)
@@ -76,7 +76,8 @@ implementation "com.mikepenz:iconics-views:${latestAndroidIconicsRelease}"
 > Note: v5.1.x or newer requires the latest font versions
 
 ```gradle
-implementation 'com.mikepenz:google-material-typeface:3.0.1.6.original-kotlin@aar'
+implementation 'com.mikepenz:google-material-typeface:4.0.0.1-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'
 implementation 'com.mikepenz:octicons-typeface:11.1.0.0-kotlin@aar'
@@ -197,7 +198,7 @@ Image(
 # Available fonts
 |Link|Prefix|Dependency|
 |---|---|---|
-|[Google Material Design Icons](https://github.com/google/material-design-icons) **ORIGINAL by Google**|gmd|implementation 'com.mikepenz:google-material-typeface:+.original@aar'|
+|[Google Material Design Icons](https://github.com/google/material-design-icons) **ORIGINAL by Google**|gmd,gmo,gmr,gms|implementation 'com.mikepenz:google-material-typeface{-outlined,rounded,sharp}:+@aar'|
 |[Material Design Iconic Font](http://zavoloklom.github.io/material-design-iconic-font) **Google Material Iconic**|gmi|implementation 'com.mikepenz:material-design-iconic-typeface:+@aar'|
 |[Fontawesome](https://fontawesome.com/)|faw|implementation 'com.mikepenz:fontawesome-typeface:+@aar'|
 |[Meteocons](http://www.alessioatzeni.com/meteocons/)|met|implementation 'com.mikepenz:meteocons-typeface:+@aar'|
@@ -207,7 +208,7 @@ Image(
 |[Typeicons](http://typicons.com/)|typ|implementation 'com.mikepenz:typeicons-typeface:+@aar'|
 |[Entypo](http://www.entypo.com/)|ent|implementation 'com.mikepenz:entypo-typeface:+@aar'|
 |[Devicon](http://devicon.fr/)|dev|implementation 'com.mikepenz:devicon-typeface:+@aar'|
-|[Foundation Icons](http://zurb.com/playground/foundation-icon-fonts-3)|fou|implementation 'com.mikepenz:foundation-icons-typeface:+@aar'|
+|[Foundation Icons](https://github.com/zurb/foundation-icon-fonts)|fou|implementation 'com.mikepenz:foundation-icons-typeface:+@aar'|
 |[Ionicons](http://ionicons.com/)|ion|implementation 'com.mikepenz:ionicons-typeface:+@aar'|
 |[Pixden7Stroke](http://themes-pixeden.com/font-demos/7-stroke/)|pe7|implementation 'com.mikepenz:pixeden-7-stroke-typeface:+@aar'|
 |[Material Design DX](https://jossef.github.io/material-design-icons-iconfont/)|cmf|implementation 'com.mikepenz:material-design-icons-dx-typeface:+@aar'|

diff --git a/app/build.gradle b/app/build.gradle
@@ -124,6 +124,9 @@ dependencies {
     implementation project(':fontawesome-typeface-library')
     implementation project(':foundation-icons-typeface-library')
     implementation project(':google-material-typeface-library')
+    implementation project(':google-material-typeface-outlined-library')
+    implementation project(':google-material-typeface-rounded-library')
+    implementation project(':google-material-typeface-sharp-library')
     implementation project(':ionicons-typeface-library')
     implementation project(':material-design-dx-typeface-library')
     implementation project(':material-design-iconic-typeface-library')

diff --git a/build.gradle b/build.gradle
@@ -18,8 +18,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "5.2.1",
-                versionCode: 50201
+                versionName: "5.2.2",
+                versionCode: 50202
         ]
 
         setup = [
@@ -31,7 +31,7 @@ buildscript {
         ]
 
         versions = [
-                kotlin          : '1.4.20',
+                kotlin          : '1.4.21',
                 androidX        : '1.0.0',
                 recyclerView    : '1.1.0',
                 material        : '1.2.1',
@@ -43,12 +43,12 @@ buildscript {
                         core: '1.3.2'
                 ],
                 startup         : '1.0.0',
-                detekt          : '1.14.2',
-                aboutLibraries  : '8.6.2',
-                materialDrawer  : '8.2.0',
+                detekt          : '1.15.0',
+                aboutLibraries  : '8.6.3',
+                materialDrawer  : '8.3.1',
                 fastAdapter     : '5.3.2',
                 // compose
-                compose         : '1.0.0-alpha08'
+                compose         : '1.0.0-alpha09'
         ]
     }
 
@@ -61,7 +61,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.0-alpha02'
+        classpath 'com.android.tools.build:gradle:7.0.0-alpha03'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
@@ -81,7 +81,7 @@ allprojects {
 }
 
 subprojects {
-    apply from: '../detekt.gradle'
+    apply from: "$rootDir/detekt.gradle"
 
     dependencies {
         detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:${versions.detekt}"

diff --git a/...le-material-typeface-library/src/main/res/font/google_material_font_v3_0_1_0_original.ttf b/...le-material-typeface-library/src/main/res/font/google_material_font_v3_0_1_0_original.ttf
diff --git a/google-material-typeface-library/src/main/res/values/font_addon.xml b/google-material-typeface-library/src/main/res/values/font_addon.xml
diff --git a/...le-material-typeface-library/build.gradle → ...le-material-typeface-library/build.gradle b/...le-material-typeface-library/build.gradle → ...le-material-typeface-library/build.gradle
@@ -26,8 +26,8 @@ android {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
         consumerProguardFiles 'consumer-proguard-rules.pro'
-        versionCode 30016
-        versionName "3.0.1.6.original-kotlin"
+        versionCode 40001
+        versionName "4.0.0.1-kotlin"
 
         resValue "string", "googlematerial_version", "${versionName}"
     }
@@ -37,13 +37,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
+    buildFeatures {
+        buildConfig = false
+    }
     lintOptions {
         abortOnError false
     }
 }
 if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly')) {
-    apply from: '../gradle-release.gradle'
+    apply from: "$rootDir/gradle-release.gradle"
 }
 
 dependencies {

diff --git a/...eface-library/consumer-proguard-rules.pro → ...eface-library/consumer-proguard-rules.pro b/...eface-library/consumer-proguard-rules.pro → ...eface-library/consumer-proguard-rules.pro
diff --git a/...terial-typeface-library/gradle.properties → ...terial-typeface-library/gradle.properties b/...terial-typeface-library/gradle.properties → ...terial-typeface-library/gradle.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 POM_NAME=Android-Iconics Google Material Typeface Library
 POM_ARTIFACT_ID=google-material-typeface
 POM_PACKAGING=aar
diff --git a/...face-library/src/main/AndroidManifest.xml → ...face-library/src/main/AndroidManifest.xml b/...face-library/src/main/AndroidManifest.xml → ...face-library/src/main/AndroidManifest.xml