From 56c2da60d23d24079bd30584d26004db7ab94884 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sat, 6 Feb 2021 13:07:38 +0100 Subject: [PATCH 1/4] - remove obsolete badges in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 59786e336..cc1eccd3f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# AboutLibraries [![Status](https://travis-ci.org/mikepenz/AboutLibraries.svg?branch=develop)](https://travis-ci.org/mikepenz/AboutLibraries) [![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/aboutlibraries/badge.svg?style=flat)](https://maven-badges.herokuapp.com/maven-central/com.mikepenz/aboutlibraries) +# AboutLibraries .. allows you to easily create an **used open source libraries** fragment/activity within your app. All the library information is automatically collected from the POM information of your dependencies and included during compile time. *No runtime overhead.* Strong caching. Any dependency is supported. From 3c4723de331059fda9cf1947e5d9ebbcfb827946 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sun, 7 Feb 2021 10:50:06 +0100 Subject: [PATCH 2/4] - update plugin to kotlin 1.4.30 - update project to properly provide transitive dependencies - update gradle-release.gradle script to ensure dependencies as compile - cleanup duplicated dependency specifications - cleanup sample app gradle some more --- aboutlibraries-core/build.gradle | 4 ++-- aboutlibraries/build.gradle | 4 ---- app/build.gradle | 4 ---- gradle-release.gradle | 3 +++ plugin-build/build.gradle | 2 ++ plugin-build/plugin/build.gradle | 4 ++-- 6 files changed, 9 insertions(+), 12 deletions(-) diff --git a/aboutlibraries-core/build.gradle b/aboutlibraries-core/build.gradle index 3d018eb0b..2d6564e0d 100644 --- a/aboutlibraries-core/build.gradle +++ b/aboutlibraries-core/build.gradle @@ -45,10 +45,10 @@ android { } dependencies { - implementation "androidx.appcompat:appcompat:${versions.appcompat}" + api "androidx.appcompat:appcompat:${versions.appcompat}" // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" + api "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" } if (project.hasProperty('pushall') || project.hasProperty('library_core_only')) { diff --git a/aboutlibraries/build.gradle b/aboutlibraries/build.gradle index d35621749..acb47f48e 100644 --- a/aboutlibraries/build.gradle +++ b/aboutlibraries/build.gradle @@ -50,7 +50,6 @@ dependencies { api project(':aboutlibraries-core') implementation "androidx.core:core-ktx:${versions.coreKtx}" - implementation "androidx.appcompat:appcompat:${versions.appcompat}" implementation "androidx.cardview:cardview:${versions.cardview}" implementation "androidx.recyclerview:recyclerview:${versions.recyclerview}" implementation "com.google.android.material:material:${versions.material}" @@ -63,9 +62,6 @@ dependencies { // https://github.com/mikepenz/FastAdapter implementation "com.mikepenz:fastadapter:${versions.fastadapter}" - // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" - // navigation implementation "androidx.navigation:navigation-fragment-ktx:${versions.navigation}" } diff --git a/app/build.gradle b/app/build.gradle index 00174928e..015fc7bff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -86,7 +86,6 @@ dependencies { implementation project(':aboutlibraries') implementation "com.google.android.material:material:${versions.material}" - implementation "androidx.appcompat:appcompat:${versions.appcompat}" implementation "androidx.recyclerview:recyclerview:${versions.recyclerview}" implementation "androidx.cardview:cardview:${versions.cardview}" @@ -107,9 +106,6 @@ dependencies { //https://github.com/mikepenz/Android-Iconics implementation "com.mikepenz:material-design-iconic-typeface:2.2.0.8-kotlin@aar" - // kotlin - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:${versions.kotlin}" - // used only tho showcase multi flavor support stagingImplementation("com.squareup.okhttp3:okhttp:4.9.1") } diff --git a/gradle-release.gradle b/gradle-release.gradle index d3a2af620..9565c7985 100644 --- 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/plugin-build/build.gradle b/plugin-build/build.gradle index c0970dc00..3e112e107 100644 --- a/plugin-build/build.gradle +++ b/plugin-build/build.gradle @@ -4,6 +4,7 @@ buildscript { repositories { maven { url "https://plugins.gradle.org/m2/" } google() + mavenCentral() jcenter() mavenLocal() } @@ -12,6 +13,7 @@ buildscript { allprojects { repositories { google() + mavenCentral() jcenter() mavenLocal() } diff --git a/plugin-build/plugin/build.gradle b/plugin-build/plugin/build.gradle index 9d2e61026..4992888d3 100644 --- a/plugin-build/plugin/build.gradle +++ b/plugin-build/plugin/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21" + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" } } plugins { @@ -54,7 +54,7 @@ repositories { dependencies { implementation gradleApi() implementation localGroovy() - implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.21' + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.30' } compileGroovy { From d2766c840886b775a73460a0fd92f3129eff8bf5 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sun, 7 Feb 2021 11:11:22 +0100 Subject: [PATCH 3/4] - update iconics to 5.2.5 - update fastadapter to 5.3.4 - update materialDrawer to 8.3.2 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 094d3fb4e..fb7b1a598 100644 --- a/build.gradle +++ b/build.gradle @@ -23,10 +23,10 @@ buildscript { kotlin : "1.4.30", constraintLayout: '2.0.4', navigation : "2.3.3", - iconics : "5.2.1", + iconics : "5.2.5", detekt : '1.15.0', - fastadapter : "5.3.2", - materialdrawer : "8.3.1", + fastadapter : "5.3.4", + materialdrawer : "8.3.2", coreKtx : "1.3.2" ] } From 27fd0ae976a0a42d57076bd93f8641a6d3540af2 Mon Sep 17 00:00:00 2001 From: Mike Penz Date: Sun, 7 Feb 2021 11:20:44 +0100 Subject: [PATCH 4/4] - [release] v8.8.2 --- README.md | 2 +- gradle.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index cc1eccd3f..053222fe3 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ ## Latest releases 🛠 -- Kotlin && Gradle Plugin | [v8.8.1](https://github.com/mikepenz/AboutLibraries/tree/v8.8.1) +- Kotlin && Gradle Plugin | [v8.8.2](https://github.com/mikepenz/AboutLibraries/tree/v8.8.2) - Kotlin | [v7.1.0](https://github.com/mikepenz/AboutLibraries/tree/v7.1.0) - Java && AndroidX | [v6.2.3](https://github.com/mikepenz/AboutLibraries/tree/v6.2.3) - Java && AppCompat | [v6.1.1](https://github.com/mikepenz/AboutLibraries/tree/v6.1.1) diff --git a/gradle.properties b/gradle.properties index c0dd0fb61..ac7439960 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,8 +15,8 @@ org.gradle.jvmargs=-Xmx1536m # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true GROUP=com.mikepenz -VERSION=8.8.1 -VERSION_CODE=80801 +VERSION=8.8.2 +VERSION_CODE=80802 POM_URL=https://github.com/mikepenz/AboutLibraries POM_SCM_URL=https://github.com/mikepenz/AboutLibraries POM_SCM_CONNECTION=scm:git@github.com:mikepenz/AboutLibraries.git