Merge pull request #565 from mikepenz/develop

dev -> main
mikepenz · Feb 7, 2021 · bf7405c · bf7405c
2 parents 8e7d3ff + cf1e269
commit bf7405c
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -79,7 +79,7 @@ jobs:
         if: startsWith(github.ref, 'refs/tags/')
         run: ./gradlew app:assembleRelease app:bundleRelease
 
-      - name: Prepare Gradle Publish properties
+      - name: Prepare Sonatype Gradle properties
         if: startsWith(github.ref, 'refs/tags/')
         run: |
           echo "${{ secrets.SONATYPE_GPG_FILE }}" > opensource.gpg.asc

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Android-Iconics [![Status](https://travis-ci.org/mikepenz/Android-Iconics.svg?branch=develop)](https://travis-ci.org/mikepenz/Android-Iconics) [![Download](https://api.bintray.com/packages/mikepenz/maven/com.mikepenz%3Aiconics-core/images/download.svg) ](https://bintray.com/mikepenz/maven/com.mikepenz%3Aiconics-core/_latestVersion)
+# Android-Iconics
 
 ... allows to include any icon font with all its vector icons in your project. No limits. **Scale with no limit**, use **any color** at any time, provide a **contour**, and many additional customizations...
 
@@ -50,7 +50,7 @@
 
 ## Latest releases 🛠
 
-- Kotlin Next Gen | [v5.2.5](https://github.com/mikepenz/Android-Iconics/tree/v5.2.5)
+- Kotlin Next Gen | [v5.2.6](https://github.com/mikepenz/Android-Iconics/tree/v5.2.6)
 - 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)

diff --git a/build.gradle b/build.gradle
@@ -18,8 +18,8 @@ buildscript {
 
     ext {
         release = [
-                versionName: "5.2.5",
-                versionCode: 50205
+                versionName: "5.2.6",
+                versionCode: 50206
         ]
 
         setup = [
@@ -46,7 +46,7 @@ buildscript {
                 detekt          : '1.15.0',
                 aboutLibraries  : '8.8.0',
                 materialDrawer  : '8.3.1',
-                fastAdapter     : '5.3.2',
+                fastAdapter     : '5.3.4',
                 // compose
                 compose         : '1.0.0-alpha11'
         ]

diff --git a/community-material-typeface-library/build.gradle b/community-material-typeface-library/build.gradle
@@ -47,5 +47,4 @@ if (project.hasProperty('pushall') || project.hasProperty('communitymaterialonly
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/devicon-typeface-library/build.gradle b/devicon-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('DevIcononly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/entypo-typeface-library/build.gradle b/entypo-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('Entypoonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/fontawesome-typeface-library/build.gradle b/fontawesome-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('fontawesomeonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/foundation-icons-typeface-library/build.gradle b/foundation-icons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('FoundationIconsonly')
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/google-material-typeface/google-material-typeface-library/build.gradle b/google-material-typeface/google-material-typeface-library/build.gradle
@@ -50,5 +50,4 @@ if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly'))
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/google-material-typeface/google-material-typeface-outlined-library/build.gradle b/google-material-typeface/google-material-typeface-outlined-library/build.gradle
@@ -50,5 +50,4 @@ if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly'))
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/google-material-typeface/google-material-typeface-rounded-library/build.gradle b/google-material-typeface/google-material-typeface-rounded-library/build.gradle
@@ -50,5 +50,4 @@ if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly'))
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/google-material-typeface/google-material-typeface-sharp-library/build.gradle b/google-material-typeface/google-material-typeface-sharp-library/build.gradle
@@ -50,5 +50,4 @@ if (project.hasProperty('pushall') || project.hasProperty('googlematerialonly'))
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -79,6 +79,9 @@ afterEvaluate { project ->
                     asNode().appendNode('description', POM_DESCRIPTION)
                     asNode().appendNode('url', POM_SCM_URL)
                     asNode().children().last() + pomConfig
+
+                    // we want dependencies as compile, to ensure they are transitively resolved
+                    asNode().dependencies.'*'.findAll() { it.scope.text() == 'runtime' }.each { it.scope*.value = 'compile' }
                 }
             }
         }

diff --git a/gradle.properties b/gradle.properties
@@ -27,7 +27,7 @@ POM_SCM_URL_ISSUES=https://github.com/mikepenz/Android-Iconics/issues
 POM_GITHUB_REPO=mikepenz/Android-Iconics
 POM_GITHUB_README=README.md
 
-POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_NAME=Apache-2.0
 POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
 POM_LICENCE_DIST=repo
 

diff --git a/iconics-core/build.gradle b/iconics-core/build.gradle
@@ -56,13 +56,12 @@ android {
     // specify the artifactId as module-name for kotlin
     kotlinOptions.freeCompilerArgs += ["-module-name", POM_ARTIFACT_ID]
 }
-if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) {
-    apply from: '../gradle-release.gradle'
-}
 
 dependencies {
     api project(':iconics-typeface-api')
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
-    implementation "androidx.core:core-ktx:$versions.ktx.core"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+}
+
+if (project.hasProperty('pushall') || project.hasProperty('librarycoreonly')) {
+    apply from: '../gradle-release.gradle'
 }
diff --git a/iconics-typeface-api/build.gradle b/iconics-typeface-api/build.gradle
@@ -61,7 +61,8 @@ if (project.hasProperty('pushall') || project.hasProperty('librarytypefaceonly')
 }
 
 dependencies {
-    implementation "androidx.core:core-ktx:$versions.ktx.core"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+    api "androidx.core:core-ktx:$versions.ktx.core"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
+
     api "androidx.startup:startup-runtime:$versions.startup"
 }
diff --git a/iconics-views/build.gradle b/iconics-views/build.gradle
@@ -60,6 +60,4 @@ if (project.hasProperty('pushall') || project.hasProperty('libraryviewsonly')) {
 dependencies {
     implementation project(':iconics-core')
     implementation "androidx.appcompat:appcompat:$versions.appcompat"
-    implementation "androidx.core:core-ktx:$versions.ktx.core"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/ionicons-typeface-library/build.gradle b/ionicons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('Ioniconsonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/material-design-dx-typeface-library/build.gradle b/material-design-dx-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('materialdesigndxonly'
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/material-design-iconic-typeface-library/build.gradle b/material-design-iconic-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('materialdesigniconico
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/meteocons-typeface-library/build.gradle b/meteocons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('meteoconsonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/octicons-typeface-library/build.gradle b/octicons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('octicons')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/phosphor-typeface-library/build.gradle b/phosphor-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('phosphor')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/pixeden-7-stroke-typeface-library/build.gradle b/pixeden-7-stroke-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('Pixeden7Strokeonly'))
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/typeicons-typeface-library/build.gradle b/typeicons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('Typeiconsonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }
diff --git a/weather-icons-typeface-library/build.gradle b/weather-icons-typeface-library/build.gradle
@@ -48,5 +48,4 @@ if (project.hasProperty('pushall') || project.hasProperty('weathericonsonly')) {
 
 dependencies {
     implementation project(':iconics-typeface-api')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin"
 }