Merge branch 'release/v3.1.0-rc01'

mikepenz · Aug 11, 2018 · 662a388 · 662a388
2 parents 6833ca5 + 2bbbe92
commit 662a388
Show file tree

Hide file tree

Showing 75 changed files with 510 additions and 507 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,12 +2,11 @@ language: android
 android:
   components:
     - tools
-    - build-tools-27.0.1
-    - build-tools-27.0.2
-    - build-tools-27.0.3
-    - android-27
+    - build-tools-28.0.2
+    - android-28
 before_install:
-    - yes | sdkmanager "platforms;android-27"
+    - yes | sdkmanager "platforms;android-28"
+    - yes | sdkmanager "build-tools;28.0.2"
 jdk:
     - oraclejdk8
 script:

diff --git a/README.md b/README.md
@@ -49,6 +49,12 @@ For generating string field for each of icons of your font, you can use this sim
 
 [Android-Iconics String Generator](https://github.com/zTrap/Android-Iconics-String-Generator)
 
+# Android module generator
+
+A awesome gradle plugin which can automatically fetch a font from Fontastic, and generate the Android Module for your project.
+
+[Iconics-Font-Generator](https://github.com/ligol/IconicsFontGenerator)
+
 # Migration
 - [MIGRATION GUIDE](https://github.com/mikepenz/Android-Iconics/blob/develop/MIGRATION.md)
 
@@ -57,22 +63,23 @@ For generating string field for each of icons of your font, you can use this sim
 ## 1. Provide the gradle dependency
 ```gradle
 //the core iconcis library (without any widgets)
-implementation "com.mikepenz:iconics-core:3.0.4@aar"
-implementation "com.android.support:appcompat-v7:${supportLibVersion}"
+implementation "com.mikepenz:iconics-core:3.1.0-rc01"
+implementation "androidx.appcompat:appcompat:${androidXVersion}"
 ```
 
 ## 1b. (optional) Add the view's dependency
 ```gradle
 //this adds all ui view widgets (IconicsButton, IconicsImageView, ...)
-implementation "com.mikepenz:iconics-views:3.0.4@aar"
+implementation "com.mikepenz:iconics-views:3.1.0-rc01"
 ```
 
+To use appcompat please use a version smaller than 3.1.0. (See the releases on GitHub)
 
 ## 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.6.0@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'
@@ -303,6 +310,7 @@ https://play.google.com/store/apps/details?id=com.mikepenz.iconics.sample
 
 # Special Contributor
 - [Peter Gulko](https://github.com/zTrap) Thanks for providing better XML support for compound Iconics drawables, and for doing the initial work of splitting up core and views library
+- [Baptiste Lagache](https://github.com/ligol) Thanks for the gradle font module generator
 - Also thanks for all the other contributors.
 
 # Credits

diff --git a/app/build.gradle b/app/build.gradle
@@ -18,8 +18,10 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 30040
-        versionName "3.0.4"
+        versionCode release.versionCode
+        versionName release.versionName
+
+        multiDexEnabled true
 
         setProperty("archivesBaseName", "Android Iconics-v$versionName-c$versionCode")
     }
@@ -50,25 +52,25 @@ android {
 }
 
 dependencies {
-    testImplementation 'junit:junit:4.12'
+    implementation 'com.android.support:multidex:1.0.3'
 
-    implementation "com.android.support:appcompat-v7:${versions.supportLib}"
-    implementation "com.android.support:design:${versions.supportLib}"
-    implementation "com.android.support:recyclerview-v7:${versions.supportLib}"
-    implementation "com.android.support:cardview-v7:${versions.supportLib}"
+    implementation "androidx.appcompat:appcompat:${versions.androidXVersion}"
+    implementation "com.google.android.material:material:${versions.androidXVersion}"
+    implementation "androidx.recyclerview:recyclerview:${versions.androidXVersion}"
+    implementation "androidx.cardview:cardview:${versions.androidXVersion}"
 
     // used to base on some backwards compatible themes
     // contains util classes to support various android versions, and clean up code
     // comes with the awesome "Holder"-Pattern
     // https://github.com/mikepenz/Materialize
-    implementation 'com.mikepenz:materialize:1.1.2@aar'
+    implementation 'com.mikepenz:materialize:1.2.0-rc01'
 
     // 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.5@aar'
-    implementation 'com.mikepenz:fastadapter-commons:3.2.5@aar'
-    implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.5@aar'
+    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'
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
@@ -82,7 +84,7 @@ dependencies {
 
     // used to generate the Open Source section
     // https://github.com/mikepenz/AboutLibraries
-    implementation('com.mikepenz:aboutlibraries:6.0.8@aar') {
+    implementation('com.mikepenz:aboutlibraries:6.0.9@aar') {
         transitive = true
         exclude module: "fastadapter"
         exclude module: "iconics-core"
@@ -104,4 +106,6 @@ dependencies {
     implementation project(':foundation-icons-typeface-library')
     implementation project(':ionicons-typeface-library')
     implementation project(':pixeden-7-stroke-typeface-library')
+
+    testImplementation 'junit:junit:4.12'
 }
diff --git a/app/src/main/java/com/mikepenz/iconics/sample/AutomaticActivity.java b/app/src/main/java/com/mikepenz/iconics/sample/AutomaticActivity.java
@@ -17,9 +17,9 @@
 package com.mikepenz.iconics.sample;
 
 import android.os.Bundle;
-import android.support.v4.view.LayoutInflaterCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.core.view.LayoutInflaterCompat;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.widget.TextView;
 
 import com.mikepenz.iconics.context.IconicsLayoutInflater2;

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/CustomApplication.java b/app/src/main/java/com/mikepenz/iconics/sample/CustomApplication.java
@@ -1,13 +1,13 @@
 package com.mikepenz.iconics.sample;
 
 
-import android.app.Application;
-
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.iconics.sample.typeface.CustomFont;
 import com.mikepenz.iconics.typeface.GenericFont;
 
-public class CustomApplication extends Application {
+import androidx.multidex.MultiDexApplication;
+
+public class CustomApplication extends MultiDexApplication {
 
     @Override
     public void onCreate() {

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/IconsFragment.java b/app/src/main/java/com/mikepenz/iconics/sample/IconsFragment.java
@@ -5,12 +5,12 @@
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v7.widget.DefaultItemAnimator;
-import android.support.v7.widget.GridLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.DefaultItemAnimator;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/MainActivity.java b/app/src/main/java/com/mikepenz/iconics/sample/MainActivity.java
@@ -19,10 +19,10 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.SearchView;
-import android.support.v7.widget.Toolbar;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuInflater;

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.java b/app/src/main/java/com/mikepenz/iconics/sample/PlaygroundActivity.java
@@ -21,9 +21,9 @@
 import android.graphics.Color;
 import android.graphics.drawable.StateListDrawable;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.text.style.BackgroundColorSpan;

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/SpaceItemDecoration.java b/app/src/main/java/com/mikepenz/iconics/sample/SpaceItemDecoration.java
@@ -2,7 +2,7 @@
 
 import android.content.res.Resources;
 import android.graphics.Rect;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 
 /**

diff --git a/app/src/main/java/com/mikepenz/iconics/sample/item/IconItem.java b/app/src/main/java/com/mikepenz/iconics/sample/item/IconItem.java
@@ -1,7 +1,7 @@
 package com.mikepenz.iconics.sample.item;
 
 import android.graphics.Color;
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 import android.view.View;
 import android.widget.TextView;
 

diff --git a/app/src/main/res/layout/activity_automatic.xml b/app/src/main/res/layout/activity_automatic.xml
@@ -23,7 +23,7 @@
     tools:context="com.mikepenz.iconics.sample.PlaygroundActivity"
     tools:ignore="MissingPrefix">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -18,7 +18,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/activity_playground.xml b/app/src/main/res/layout/activity_playground.xml
@@ -23,7 +23,7 @@
               tools:context="com.mikepenz.iconics.sample.PlaygroundActivity"
               tools:ignore="MissingPrefix">
 
-    <android.support.v7.widget.Toolbar
+    <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"

diff --git a/app/src/main/res/layout/icons_fragment.xml b/app/src/main/res/layout/icons_fragment.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.RecyclerView
+<androidx.recyclerview.widget.RecyclerView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/list"
     android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/row_icon.xml b/app/src/main/res/layout/row_icon.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 
-<android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="5dp"
@@ -42,4 +42,4 @@
         android:padding="8dp"
         android:scaleType="fitXY" />
 
-</android.support.v7.widget.CardView>
+</androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -6,7 +6,7 @@
     <item
         android:id="@+id/search"
         android:title="@string/search_title"
-        app:actionViewClass="android.support.v7.widget.SearchView"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="collapseActionView|ifRoom" />
 
     <item

diff --git a/build.gradle b/build.gradle
@@ -1,32 +1,36 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext {
+        release = [
+                versionName: "3.1.0-rc01",
+                versionCode: 3100
+        ]
+
         setup = [
-                compileSdk: 27,
-                buildTools: "27.0.3",
+                compileSdk: 28,
+                buildTools: "28.0.2",
                 minSdk    : 14,
-                targetSdk : 27
+                targetSdk : 28
         ]
 
         versions = [
-                supportLib: "27.1.1"
+                androidXVersion: '1.0.0-rc01'
         ]
     }
 
     repositories {
         google()
         jcenter()
     }
+
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.android.tools.build:gradle:3.3.0-alpha05'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
 allprojects {
     group "com.mikepenz"
-    version "3.0.4"
 
     repositories {
         google()

diff --git a/community-material-typeface-library/build.gradle b/community-material-typeface-library/build.gradle
@@ -40,9 +40,7 @@ android {
     }
 }
 if (project.hasProperty('pushall') || project.hasProperty('communitymaterialonly')) {
-    apply from: '../gradle-mvn-push.gradle'
-    apply plugin: 'com.novoda.bintray-release'
-    apply from: '../gradle-jcenter-push.gradle'
+    apply from: '../gradle-release.gradle'
 }
 
 dependencies {

diff --git a/community-material-typeface-library/gradle.properties b/community-material-typeface-library/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=2.0.46.1
-VERSION_CODE=20461
 POM_NAME=Android-Iconics Community Material Icons Typeface Library
 POM_ARTIFACT_ID=community-material-typeface
 POM_PACKAGING=aar
diff --git a/devicon-typeface-library/build.gradle b/devicon-typeface-library/build.gradle
@@ -39,9 +39,7 @@ android {
     }
 }
 if (project.hasProperty('pushall') || project.hasProperty('DevIcononly')) {
-    apply from: '../gradle-mvn-push.gradle'
-    apply plugin: 'com.novoda.bintray-release'
-    apply from: '../gradle-jcenter-push.gradle'
+    apply from: '../gradle-release.gradle'
 }
 
 dependencies {

diff --git a/devicon-typeface-library/gradle.properties b/devicon-typeface-library/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=2.0.0.4
-VERSION_CODE=20004
 POM_NAME=Android-Iconics DevIcon Typeface Library
 POM_ARTIFACT_ID=devicon-typeface
 POM_PACKAGING=aar
diff --git a/entypo-typeface-library/build.gradle b/entypo-typeface-library/build.gradle
@@ -39,9 +39,7 @@ android {
     }
 }
 if (project.hasProperty('pushall') || project.hasProperty('Entypoonly')) {
-    apply from: '../gradle-mvn-push.gradle'
-    apply plugin: 'com.novoda.bintray-release'
-    apply from: '../gradle-jcenter-push.gradle'
+    apply from: '../gradle-release.gradle'
 }
 
 dependencies {

diff --git a/entypo-typeface-library/gradle.properties b/entypo-typeface-library/gradle.properties
@@ -1,5 +1,3 @@
-VERSION_NAME=1.0.0.4
-VERSION_CODE=10004
 POM_NAME=Android-Iconics Entypo Typeface Library
 POM_ARTIFACT_ID=entypo-typeface
 POM_PACKAGING=aar