Merge branch 'release/v4.0.0'

mikepenz · Oct 18, 2019 · ea0f823 · ea0f823
2 parents 2ea904c + 2c18029
commit ea0f823
Show file tree

Hide file tree

Showing 23 changed files with 317 additions and 247 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: [mikepenz]
diff --git a/README.md b/README.md
@@ -14,14 +14,11 @@ The ActionItemBadge Library is pushed to [Maven Central], so you just need to ad
 
 ```javascript
 dependencies {
-	implementation 'com.mikepenz:actionitembadge:3.3.2@aar'
+	implementation 'com.mikepenz:actionitembadge:4.0.0'
 
 	//SUB-DEPENDENCIES
 	//Android-Iconics - used to provide an easy API for icons 
 	implementation 'com.mikepenz:iconics-core:{latestVersion}@aar'
-
-	//appcompat
-	implementation "com.android.support:appcompat-v7:${supportLibVersion}"
 }
 ```
 
@@ -30,6 +27,9 @@ If you are going to use the icon font you will have to add additional dependency
 You can find all available addons here: https://github.com/mikepenz/Android-Iconics#2-choose-your-desired-fonts
 
 ## UPGRADE NOTES
+#### < 4.0.0
+- If you come from a version prior 4.0.0 you will have to upgrade to AndroidX and Iconics v4
+
 #### < 3.0.0
 - If you come from a version prior 3.0.0 you will have to rename some classes, and the default styles also found a new place. Just check out the updated sample app for all the changes.
 
@@ -99,7 +99,7 @@ call invalidateOptionsMenu() afterwards.
 
 # License
 
-    Copyright 2017 Mike Penz
+    Copyright 2019 Mike Penz
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,19 +1,43 @@
 apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
+
+//wrap with try and catch so the build is working even if the signing stuff is missing
+try {
+    apply from: '../../../signing.gradle'
+} catch (ex) {
+}
 
 android {
-    compileSdkVersion rootProject.ext.compileSdkVersion
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdkVersion setup.compileSdk
+    buildToolsVersion setup.buildTools
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 27
-        versionCode 332
-        versionName "3.3.2"
+        minSdkVersion setup.minSdk
+        targetSdkVersion setup.targetSdk
+        versionCode release.versionCode
+        versionName release.versionName
+
+        multiDexEnabled true
+
+        setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
     }
     buildTypes {
+        debug {
+            versionNameSuffix "-DEBUG"
+            try {
+                signingConfig signingConfigs.debug
+            } catch (ex) {
+            }
+            minifyEnabled false
+        }
         release {
+            try {
+                signingConfig signingConfigs.release
+            } catch (ex) {
+            }
+            zipAlignEnabled true
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 
@@ -23,41 +47,40 @@ android {
 }
 
 dependencies {
-    compile project(':library')
+    implementation project(':library')
 
-    compile "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
-    compile "com.android.support:cardview-v7:${rootProject.ext.supportLibVersion}"
-    compile "com.android.support:recyclerview-v7:${rootProject.ext.supportLibVersion}"
+    implementation "androidx.appcompat:appcompat:${versions.appcompat}"
+    implementation "androidx.recyclerview:recyclerview:${versions.recyclerView}"
+    implementation "androidx.cardview:cardview:${versions.cardview}"
 
     // 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
-    compile 'com.mikepenz:materialize:1.1.1@aar'
+    implementation "com.mikepenz:materialize:${versions.materialize}"
 
     // used to fill the RecyclerView with the DrawerItems
     // and provides single and multi selection, expandable items
     // https://github.com/mikepenz/FastAdapter
-    compile 'com.mikepenz:fastadapter:2.6.3@aar'
+    implementation "com.mikepenz:fastadapter:${versions.fastadapter}"
 
     // used to provide out of the box icon font support. simplifies development,
     // and provides scalable icons. the core is very very light
     // https://github.com/mikepenz/Android-Iconics
-    compile 'com.mikepenz:iconics-core:2.9.3@aar'
+    implementation "com.mikepenz:iconics-core:${versions.iconics}"
+    implementation "com.mikepenz:iconics-views:${versions.iconics}"
 
     //used to generate the drawer on the left
     //https://github.com/mikepenz/MaterialDrawer
-    compile('com.mikepenz:materialdrawer:5.9.5@aar') {
-        exclude group: "com.android.support"
-    }
+    implementation "com.mikepenz:materialdrawer:${versions.materialdrawer}"
 
     //used to generate the Open Source section
     //https://github.com/mikepenz/AboutLibraries
-    compile 'com.mikepenz:aboutlibraries:5.9.8@aar'
+    implementation "com.mikepenz:aboutlibraries:${versions.aboutlib}"
 
     //used to display the icons in the drawer and in the menu
     //https://github.com/mikepenz/Android-Iconics
-    compile 'com.mikepenz:google-material-typeface:3.0.1.1.original@aar'
-    compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
-    compile 'com.mikepenz:crossfader:1.5.0@aar'
+    implementation 'com.mikepenz:google-material-typeface:3.0.1.4.original-kotlin@aar'
+    implementation 'com.mikepenz:fontawesome-typeface:5.9.0.0-kotlin@aar'
+    implementation 'com.mikepenz:crossfader:1.6.0@aar'
 }
diff --git a/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java b/app/src/main/java/com/mikepenz/actionitembadge/sample/MainActivity.java
@@ -1,19 +1,20 @@
 package com.mikepenz.actionitembadge.sample;
 
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
+
 import com.mikepenz.aboutlibraries.LibsBuilder;
 import com.mikepenz.aboutlibraries.ui.LibsSupportFragment;
 import com.mikepenz.actionitembadge.R;
 import com.mikepenz.actionitembadge.library.ActionItemBadge;
 import com.mikepenz.actionitembadge.library.ActionItemBadgeAdder;
-import com.mikepenz.fontawesome_typeface_library.FontAwesome;
+import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome;
 
 
 public class MainActivity extends AppCompatActivity {

diff --git a/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java b/app/src/main/java/com/mikepenz/actionitembadge/sample/ToolbarActivity.java
@@ -3,23 +3,24 @@
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Bundle;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentManager;
+
 import com.mikepenz.aboutlibraries.LibsBuilder;
 import com.mikepenz.aboutlibraries.ui.LibsSupportFragment;
 import com.mikepenz.actionitembadge.R;
 import com.mikepenz.actionitembadge.library.ActionItemBadge;
 import com.mikepenz.actionitembadge.library.ActionItemBadgeAdder;
 import com.mikepenz.actionitembadge.library.utils.BadgeStyle;
 import com.mikepenz.actionitembadge.library.utils.NumberUtils;
-import com.mikepenz.fontawesome_typeface_library.FontAwesome;
+import com.mikepenz.iconics.typeface.library.fontawesome.FontAwesome;
 import com.mikepenz.materialdrawer.Drawer;
 import com.mikepenz.materialdrawer.DrawerBuilder;
 import com.mikepenz.materialdrawer.model.DividerDrawerItem;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -7,5 +7,5 @@
     <FrameLayout
         android:id="@+id/frame_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"></FrameLayout>
+        android:layout_height="match_parent" />
 </FrameLayout>
diff --git a/app/src/main/res/layout/activity_toolbar_main.xml b/app/src/main/res/layout/activity_toolbar_main.xml
@@ -5,7 +5,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/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme.ActionBar" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme.ActionBar" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Here we setting appcompat’s actionBarStyle -->
         <item name="windowActionBar">true</item>
 
@@ -12,7 +12,7 @@
     </style>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
         <!-- ...and here we setting appcompat’s color theming attrs -->
         <item name="colorPrimary">@color/theme_default_primary</item>
         <item name="colorPrimaryDark">@color/theme_default_primary_dark</item>

diff --git a/build.gradle b/build.gradle
@@ -1,25 +1,52 @@
 buildscript {
+    ext {
+        release = [
+                versionName: "4.0.0",
+                versionCode: 4000
+        ]
+
+        setup = [
+                compileSdk: 29,
+                buildTools: "29.0.2",
+                minSdk    : 14,
+                targetSdk : 28
+        ]
+
+        versions = [
+                androidX      : '1.0.0',
+                recyclerView  : '1.1.0-beta05',
+                appcompat     : '1.1.0',
+                cardview      : '1.0.0',
+                kotlin        : '1.3.50',
+                materialize   : '1.2.1',
+                iconics       : '4.0.0',
+                materialdrawer: '7.0.0-rc08',
+                aboutlib      : '7.0.3',
+                fastadapter   : '4.1.0'
+        ]
+    }
+
     repositories {
         google()
         jcenter()
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven {
+            url "https://plugins.gradle.org/m2/"
+        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
-        classpath 'com.novoda:bintray-release:0.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
     }
 }
 
-ext {
-    compileSdkVersion = 27
-    buildToolsVersion = "27.0.0"
-    supportLibVersion = "27.0.0"
-}
-
 allprojects {
+    group "com.mikepenz"
+
     repositories {
         google()
         jcenter()
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
+        maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
     }
 }