Skip to content

Commit

Permalink
Merge branch 'release/v3.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
mikepenz committed Mar 17, 2019
2 parents 7aaad35 + 0ecefae commit 97b2f7d
Show file tree
Hide file tree
Showing 7 changed files with 875 additions and 70 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,14 @@ A awesome gradle plugin which can automatically fetch a font from Fontastic, and
## 1. Provide the gradle dependency
```gradle
//the core iconcis library (without any widgets)
implementation "com.mikepenz:iconics-core:3.2.1"
implementation "com.mikepenz:iconics-core:3.2.2"
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.2.1"
implementation "com.mikepenz:iconics-views:3.2.2"
```

To use appcompat please use a version smaller than 3.1.0. (See the releases on GitHub)
Expand All @@ -82,7 +82,7 @@ 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:community-material-typeface:3.5.95.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'
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
buildscript {
ext {
release = [
versionName: "3.2.1",
versionCode: 32010
versionName: "3.2.2",
versionCode: 32020
]

setup = [
Expand All @@ -24,7 +24,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.1'
classpath 'com.android.tools.build:gradle:3.3.2'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
}
Expand Down
4 changes: 2 additions & 2 deletions community-material-typeface-library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ android {
minSdkVersion setup.minSdk
targetSdkVersion setup.targetSdk
consumerProguardFiles 'consumer-proguard-rules.pro'
versionCode 27941
versionName "2.7.94.1"
versionCode 35951
versionName "3.5.95.1"

resValue "string", "community_material_version", "${versionName}"
}
Expand Down
Binary file not shown.
Loading

0 comments on commit 97b2f7d

Please sign in to comment.