Merge branch 'release/4.8.0' into develop

CHANGELOG.md

@@ -5,106 +5,134 @@
 ### Added
 
 ### Changed
-* Minimum Gradle Version is now **7.2**
 
 ### Deprecated
-* Android Gradle Plugin **4.x**
 
 ### Removed
 
 ### Fixed
 
 ### Security
 
+## 4.8.0
+
+### Changed
+
+- Minimum Gradle Version is now **7.2**
+
+### Deprecated
+
+- Android Gradle Plugin **4.x**
+
 ## 4.7.0
 
 ### Added
+
 - EPL v1.0 License - #15
 - Additional URL for LGPL-2.1
 
 ## 4.6.1
 
 ### Changed
+
 - update AGP version
 - update maven model library
 
 ## 4.6.0
 
 ### Added
+
 - Dark Mode for HTML report
 
 ### Changed
+
 - Sort libraries by name or maven coordinated on HTML report
 
 ## 4.5.0
 
 ### Added
+
 - Better support for Android Variants
 
 ### Changed
+
 - Internal handling of the license mappings
 
 ## 4.4.0
 
 ### Added
+
 - [SPDX License Identifier](https://spdx.org/licenses/) for various reports
 
 ### Changed
+
 - HTML and Markdown reports merge licenses with a more sophisticated algorithm
 
 ### Fixed
+
 - CSV Reporter reports all licenses not only the first one
 
 ## 4.3.0
 
 ### Changed
+
 - add maven coordinates to Library model
 - `version` is not part of the `mavenCoordinates` in the Library model
 - Improved Markdown reporter
 
 ## 4.2.0
 
 ### Added
+
 - XSD Schema for the XML reporter
 
 ### Changed
+
 - - `<version>` is now attribute to `<library>`
   - `<url>` is now a attribute to `<license>`
   - `<library>` has an `id` attribute now
 
 ### Fixed
+
 - HTML Reports includes all libraries again
 
 ## 4.1.0
 
 ### Changed
+
 - Sort dependencies by name and version
 
 ## 4.0.0
 
 ### Added
+
 - Kotlin Multiplatform support
 
 ### Changed
+
 - Extension property to set `enabled` and `destination`
 
 ## 3.3.0
 
 ### Changed
+
 - Update Android Gradle plugin to version 7+
 - Warning when license has no mapping for html reports
 
 ## 3.2.0
 
 ### Added
+
 - set task outputs to report files
 - add DSL to configure reports
 
 ### Changed
+
 - use library to create CSV report
 
 ## 3.1.0
 
 ### Changed
+
 - All public properties are now provided Properties
 - Use Kotlin Serialization instead of Moshi

README.md

@@ -18,7 +18,7 @@ This Gradle plugin provides tasks to generate a file with the licenses used from
 
 ```kotlin
 plugins {
-    id("com.cmgapps.licenses") version "4.7.0"
+    id("com.cmgapps.licenses") version "4.8.0"
 }
 ```
 </details>
@@ -28,7 +28,7 @@ plugins {
 
 ```groovy
 plugins {
-    id 'com.cmgapps.licenses' version '4.7.0'
+    id 'com.cmgapps.licenses' version '4.8.0'
 }
 ```
 </details>
@@ -46,7 +46,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath("com.cmgapps:gradle-licenses-plugin:4.7.0")
+        classpath("com.cmgapps:gradle-licenses-plugin:4.8.0")
     }
 }
 
@@ -65,7 +65,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.cmgapps:gradle-licenses-plugin:4.7.0'
+        classpath 'com.cmgapps:gradle-licenses-plugin:4.8.0'
     }
 }
 

build.gradle.kts

@@ -132,14 +132,11 @@ publishing {
             }
         }
     }
+}
 
+nexusPublishing {
     repositories {
-        maven {
-            name = "sonatype"
-            val releaseUrl = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-            val snapshotUrl = uri("https://oss.sonatype.org/content/repositories/snapshots/")
-            url = if (versionName.endsWith("SNAPSHOT")) snapshotUrl else releaseUrl
-
+        sonatype {
             val credentials =
                 Properties().apply {
                     val credFile = projectDir.resolve("credentials.properties")
@@ -149,10 +146,11 @@ publishing {
                         }
                     }
                 }
-            credentials {
-                username = credentials.getProperty("username")
-                password = credentials.getProperty("password")
-            }
+            val username: String by credentials
+            val password: String by credentials
+
+            this.username = username
+            this.password = password
         }
     }
 }

pom.properties

@@ -4,7 +4,7 @@
 # SPDX-License-Identifier: Apache-2.0
 #
 group=com.cmgapps
-versionName=4.7.0
+versionName=4.8.0
 pomName=Gradle Licenses Plugin
 pomArtifactId=gradle-licenses-plugin
 pomDescription=Gradle plugin that provides a task to generate a license report for the dependencies used in your project Java/Kotlin project.