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.

Sign up for GitHub

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 #977

Merged
merged 3 commits into from
Apr 9, 2024
Merged

dev -> main #977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd8af5a
- fix typo
mikepenz Apr 9, 2024
2f5551d
Merge pull request #976 from mikepenz/feature/ignore_case
mikepenz Apr 9, 2024
9714c02
- [release] v11.1.3
mikepenz Apr 9, 2024
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
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
View file
Open in desktop
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:[email protected]:mikepenz/AboutLibraries.git
Expand Down
2 changes: 1 addition & 1 deletion ...uild/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesExtension.kt
View file
Open in desktop
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
2 changes: 2 additions & 0 deletions plugin-build/plugin/src/main/kotlin/com/mikepenz/aboutlibraries/plugin/AboutLibrariesTask.kt
View file
Open in desktop
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
Loading