#20: Switch to Apache 2.0 license

- fill artifacts' manifests accurately
arsysop · Jun 12, 2020 · 75728bc · 75728bc
1 parent 8a13046
commit 75728bc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -80,8 +80,12 @@ tasks.jacocoTestReport {
     }
 }
 
-tasks.withType(Jar::class) {
+tasks.jar {
     extendManifest(manifest)
+}
+
+tasks.withType(Jar::class) {
+    extendManifestShort(manifest)
     from("README.md", "LICENSE")
 }
 
@@ -91,9 +95,6 @@ tasks.getByName("sourcesJar") {
 
 fun extendManifest(mf: Manifest) {
     mf.attributes(
-        "Group" to project.group,
-        "Artifact" to project.name,
-        "Version" to project.version,
         "Bundle-Vendor" to "ArSysOp",
         "Bundle-Name" to "ru.arsysop.liho",
         "Bundle-SymbolicName" to "ru.arsysop.liho",
@@ -108,6 +109,14 @@ fun extendManifest(mf: Manifest) {
     )
 }
 
+fun extendManifestShort(mf: Manifest) {
+    mf.attributes(
+        "Group" to project.group,
+        "Artifact" to project.name,
+        "Version" to project.version
+    )
+}
+
 publishing {
     publications {
         repositories {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -24,6 +24,7 @@ pluginManagement {
         mavenLocal()
         jcenter()
         maven(url = "https://dl.bintray.com/arsysop/lang")
+        maven(url = "https://dl.bintray.com/arsysop/liho")
     }
     resolutionStrategy {
         eachPlugin {