Merge pull request #23 from d4l-data4life/feature/prepare-release-1.2.0

Prepare release 1.2.0
d4l-data4life · Jan 7, 2021 · 9dbb016 · 9dbb016
2 parents a4d8c75 + cf3b98c
commit 9dbb016
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -18,8 +18,6 @@ toc::[]
 
 === Changed
 
-* BREAKING module name changed from `hc-fhir-sdk-java` to `fhir-java`
-
 === Removed
 
 === Fixed
@@ -28,6 +26,14 @@ toc::[]
 
 === Migration
 
+== https://github.com/d4l-data4life/hc-fhir-sdk-java/compare/v1.1.0...v1.2.0[1.2.0]
+
+=== Changed
+
+* BREAKING module name changed from `hc-fhir-sdk-java` to `fhir-java`
+
+=== Migration
+
 You need to update your Gradle dependency declaration from "care.data4life.hc-fhir-sdk-java:hc-fhir-sdk-java:{version}" to:
 
 [source, gradle]

diff --git a/README.adoc b/README.adoc
@@ -1,4 +1,4 @@
-:library_version: 1.1.0
+:library_version: 1.2.0
 :toc: macro
 :toclevels: 2
 :toc-title:

diff --git a/buildSrc/src/main/kotlin/LibraryConfig.kt b/buildSrc/src/main/kotlin/LibraryConfig.kt
@@ -25,7 +25,7 @@ object LibraryConfig {
     val publish = PublishConfig
     object PublishConfig {
         const val name = LibraryConfig.name
-        const val groupId = LibraryConfig.group
+        const val groupId = "${LibraryConfig.group}.${LibraryConfig.name}"
         const val description = "Minimal FHIR 3 + 4 standard models and data types for Android and Java."
         const val year = "2020"
 

diff --git a/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts b/buildSrc/src/main/kotlin/scripts/publishing-config.gradle.kts
@@ -21,8 +21,6 @@ plugins {
     `maven-publish`
 }
 
-group = ProjectConfig.library.group
-
 tasks.named<JacocoReport>("jacocoTestReport") {
     reports {
         xml.isEnabled = true
@@ -76,8 +74,8 @@ publishing {
     }
 
     publications {
-        create<MavenPublication>("mavenJava") {
-            groupId = "${ProjectConfig.library.publish.groupId}.${ProjectConfig.library.publish.name}"
+        withType<MavenPublication> {
+            groupId = ProjectConfig.library.publish.groupId
 
             from(components["java"])
             artifact(tasks["sourcesJar"])

diff --git a/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts b/buildSrc/src/main/kotlin/scripts/publishing.gradle.kts
@@ -19,8 +19,6 @@ package scripts
 import org.gradle.api.tasks.Exec
 
 plugins {
-    "maven-publish"
-
     id("care.data4life.git-publish")
 }
 

diff --git a/fhir-java/build.gradle.kts b/fhir-java/build.gradle.kts
@@ -21,6 +21,8 @@ plugins {
   id("scripts.publishing-config")
 }
 
+group = ProjectConfig.library.group
+
 java {
   sourceCompatibility = JavaVersion.VERSION_1_7
   targetCompatibility = JavaVersion.VERSION_1_7