Skip to content

Commit

Permalink
Merge pull request #619 from mikepenz/develop
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
mikepenz authored Feb 7, 2021
2 parents fab19eb + 27fd0ae commit afb7fec
Show file tree
Hide file tree
Showing 9 changed files with 16 additions and 19 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions aboutlibraries-core/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
Expand Down
4 changes: 0 additions & 4 deletions aboutlibraries/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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}"
}
Expand Down
4 changes: 0 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand All @@ -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")
}
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Expand Down
3 changes: 3 additions & 0 deletions gradle-release.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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' }
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions plugin-build/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ buildscript {
repositories {
maven { url "https://plugins.gradle.org/m2/" }
google()
mavenCentral()
jcenter()
mavenLocal()
}
Expand All @@ -12,6 +13,7 @@ buildscript {
allprojects {
repositories {
google()
mavenCentral()
jcenter()
mavenLocal()
}
Expand Down
4 changes: 2 additions & 2 deletions plugin-build/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit afb7fec

Please sign in to comment.