Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev -> main #627

Merged
merged 5 commits into from
Mar 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

## Latest releases 🛠

- Kotlin && Gradle Plugin | [v8.8.3](https://github.com/mikepenz/AboutLibraries/tree/v8.8.3)
- Kotlin && Gradle Plugin | [v8.8.4](https://github.com/mikepenz/AboutLibraries/tree/v8.8.4)
- 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 Expand Up @@ -212,7 +212,7 @@ custom_author_mappings.prop // allows overwriting the authors of a library if th
custom_exclusion_list.prop // allows excluding libraries by their id at build time
```

See the corresponding files here for the format and content: https://github.com/mikepenz/AboutLibraries/tree/develop/library-definitions/src/main/res/raw
See the corresponding files here for the format and content: https://github.com/mikepenz/AboutLibraries/tree/develop/aboutlibraries-definitions/src/main/res/raw

### Exclude libraries

Expand Down
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ buildscript {
appcompat : '1.2.0',
recyclerview : '1.1.0',
material : '1.3.0',
kotlin : "1.4.30",
kotlin : "1.4.31",
constraintLayout: '2.0.4',
navigation : "2.3.3",
iconics : "5.2.5",
iconics : "5.2.8",
detekt : '1.15.0',
fastadapter : "5.3.4",
materialdrawer : "8.3.2",
fastadapter : "5.3.5",
materialdrawer : "8.3.3",
coreKtx : "1.3.2"
]
}
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.3
VERSION_CODE=80803
VERSION=8.8.4
VERSION_CODE=80804
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: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
2 changes: 0 additions & 2 deletions plugin-build/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" }
google()
mavenCentral()
jcenter()
mavenLocal()
}
}
Expand All @@ -14,7 +13,6 @@ allprojects {
repositories {
google()
mavenCentral()
jcenter()
mavenLocal()
}

Expand Down
10 changes: 5 additions & 5 deletions plugin-build/plugin/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ buildscript {
jcenter()
}
dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31"
}
}
plugins {
id 'java'
id "com.gradle.plugin-publish" version "0.12.0"
id "com.gradle.plugin-publish" version "0.13.0"
id "java-gradle-plugin"
id 'maven-publish'
}
Expand Down Expand Up @@ -54,7 +54,7 @@ repositories {
dependencies {
implementation gradleApi()
implementation localGroovy()
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.30'
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.4.31'
}

compileGroovy {
Expand All @@ -63,10 +63,10 @@ compileGroovy {
}

processResources {
from("../../library-definitions/src/main/res/raw/") {
from("../../aboutlibraries-definitions/src/main/res/raw/") {
into 'static'
}
from("../../library-definitions/src/main/res/values/") {
from("../../aboutlibraries-definitions/src/main/res/values/") {
into 'values'
}
}
Expand Down