Skip to content

Commit

Permalink
Merge pull request #977 from mikepenz/develop
Browse files Browse the repository at this point in the history
dev -> main
  • Loading branch information
mikepenz committed Apr 9, 2024
2 parents a283a29 + 9714c02 commit 053b253
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@

## Latest releases 🛠

- Kotlin && Multiplatform && Compose && Plugin | [v11.1.2](https://github.com/mikepenz/AboutLibraries/tree/v11.1.2)
- Kotlin && Multiplatform && Compose && Plugin | [v11.1.3](https://github.com/mikepenz/AboutLibraries/tree/v11.1.3)

## Gradle Plugin

Expand Down
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GROUP=com.mikepenz

VERSION_NAME=11.1.2
VERSION_CODE=110102
VERSION_NAME=11.1.3
VERSION_CODE=110103
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
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ abstract class AboutLibrariesExtension {

/**
* Defines the allowed licenses for specific libraries which will not result in warnings or failures depending on the [strictMode] configuration.
* This is useful if some dependencies have special licenses which are only used in testing and are accepted for thsi case.
* This is useful if some dependencies have special licenses which are only used in testing and are accepted for this case.
*
* ```
* aboutLibraries {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,11 @@ abstract class AboutLibrariesTask : BaseAboutLibrariesTask() {
}

val missingMapped = mutableMapOf<License, List<Library>>()
val allowedLicensesMap = allowedLicensesMap.mapKeys { (key, _) -> key.lowercase(Locale.ENGLISH) }
if (allowedLicensesMap.isNotEmpty()) {
missing.forEach {
val id = it.spdxId?.lowercase(Locale.ENGLISH) ?: it.hash.lowercase(Locale.ENGLISH)
val name = it.name.lowercase(Locale.ENGLISH)

val libsForLicense = allowedLicensesMap[id] ?: allowedLicensesMap[name]
if (libsForLicense != null) {
Expand Down

0 comments on commit 053b253

Please sign in to comment.