Merge branch 'release/v3.0.2'

mikepenz · Jan 21, 2018 · c726c0c · c726c0c
2 parents 1e5557e + 0c2377e
commit c726c0c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -52,14 +52,14 @@ Provide additional fonts for you project, or even create your custom font with j
 ## 1. Provide the gradle dependency
 ```gradle
 //the core iconcis library (without any widgets)
-implementation "com.mikepenz:iconics-core:3.0.1@aar"
+implementation "com.mikepenz:iconics-core:3.0.2@aar"
 implementation "com.android.support:appcompat-v7:${supportLibVersion}"
 ```
 
 ## 1b. (optional) Add the view's dependency
 ```
 //this adds all ui view widgets (IconicsButton, IconicsImageView, ...)
-implementation "com.mikepenz:iconics-views:3.0.1@aar"
+implementation "com.mikepenz:iconics-views:3.0.2@aar"
 ```
 
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -18,8 +18,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 30010
-        versionName "3.0.1"
+        versionCode 30020
+        versionName "3.0.2"
 
         setProperty("archivesBaseName", "Android Iconics-v$versionName-c$versionCode")
     }

diff --git a/iconics-view-library/build.gradle b/iconics-view-library/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3010
-        versionName "3.0.1"
+        versionCode 3020
+        versionName "3.0.2"
     }
     buildTypes {
         release {

diff --git a/iconics-view-library/gradle.properties b/iconics-view-library/gradle.properties
@@ -12,8 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-VERSION_NAME=3.0.1
-VERSION_CODE=3010
+VERSION_NAME=3.0.2
+VERSION_CODE=3020
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-views
 POM_PACKAGING=aar
diff --git a/library-core/build.gradle b/library-core/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 3010
-        versionName "3.0.1"
+        versionCode 3020
+        versionName "3.0.2"
     }
     buildTypes {
         release {

diff --git a/library-core/gradle.properties b/library-core/gradle.properties
@@ -12,8 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-VERSION_NAME=3.0.1
-VERSION_CODE=3010
+VERSION_NAME=3.0.2
+VERSION_CODE=3020
 POM_NAME=Android-Iconics Library
 POM_ARTIFACT_ID=iconics-core
 POM_PACKAGING=aar
diff --git a/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java b/library-core/src/main/java/com/mikepenz/iconics/IconicsDrawable.java
@@ -1090,8 +1090,9 @@ public void draw(@NonNull Canvas canvas) {
                 }
             }
 
-            if (!mPath.isEmpty()) {
+            try {
                 mPath.close();
+            } catch (Exception ignored) {
             }
 
             if (mDrawContour) {
@@ -1129,8 +1130,9 @@ public void setTintMode(@NonNull PorterDuff.Mode tintMode) {
     @Override
     protected void onBoundsChange(Rect bounds) {
         offsetIcon(bounds);
-        if (!mPath.isEmpty()) {
+        try {
             mPath.close();
+        } catch (Exception ignored) {
         }
         super.onBoundsChange(bounds);
     }

diff --git a/library-core/src/main/res/values/library_androidiconics_strings.xml b/library-core/src/main/res/values/library_androidiconics_strings.xml
@@ -26,7 +26,7 @@
         This library allows you to include vector icons everywhere in your project. No limits are given. Scale with no limit, use any Color at any time, provide a contour, and many additional customizations
         ]]>
     </string>
-    <string name="library_AndroidIconics_libraryVersion">3.0.1</string>
+    <string name="library_AndroidIconics_libraryVersion">3.0.2</string>
     <string name="library_AndroidIconics_libraryWebsite">https://github.com/mikepenz/Android-Iconics</string>
     <string name="library_AndroidIconics_licenseId">apache_2_0</string>
     <string name="library_AndroidIconics_isOpenSource">true</string>