# configured maven-publish

SchwarzIT · Dec 7, 2023 · e6e36c1 · e6e36c1
1 parent b41241f
commit e6e36c1
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 113 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,6 +2,7 @@
 
 buildscript {
     ext.kotlin_version = '1.9.21'
+    ext.groupName = 'com.github.SchwarzIT'
     repositories {
         google()
         mavenCentral()
@@ -41,10 +42,21 @@ subprojects {
 
 }
 
+def versionName() {
+
+    if (!hasProperty("version")) {
+        // don't care
+        return "dummy"
+    }
+
+    return property("version")
+}
+
 
 allprojects {
-    version = "dummy"
-    group = 'com.schwarz.crystal-map'
+    version = versionName()
+    group = groupName
+
     repositories {
         google()
         mavenCentral()

diff --git a/crystal-map-api/build.gradle b/crystal-map-api/build.gradle
@@ -1,5 +1,6 @@
 apply plugin: 'kotlin'
 apply plugin: 'maven-publish'
+apply plugin: 'java'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -8,14 +9,12 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
+java {
+    withSourcesJar()
+    withJavadocJar()
 }
 
 publishing {
@@ -27,31 +26,4 @@ publishing {
             from components.java
         }
     }
-}
-
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-buildscript {
-    ext.kotlin_version = '1.9.21'
-    repositories {
-        mavenCentral()
-    }
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-repositories {
-    mavenCentral()
-}
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
+}
diff --git a/crystal-map-couchbase-connector/build.gradle b/crystal-map-couchbase-connector/build.gradle
@@ -4,11 +4,11 @@ apply plugin: 'kotlin-android'
 
 android {
     namespace "com.schwarz.crystalcouchbaseconnector"
-    compileSdkVersion 33
 
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
+        compileSdk = 33
         versionCode 1
         versionName "1.0"
 
@@ -28,38 +28,13 @@ android {
     }
 }
 
-group = 'com.github.SchwarzIT'
 
-task sourcesJar(type: Jar) {
-    archiveClassifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-task javadoc(type: Javadoc) {
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-task classesJar(type: Jar) {
-    from "$buildDir/intermediates/classes/release"
-}
-
-artifacts {
-    archives classesJar
-    archives javadocJar
-    archives sourcesJar
-}
 
 afterEvaluate {
     publishing {
         publications {
             maven(MavenPublication) {
-                groupId project.group
+                groupId groupName
                 artifactId project.name
                 version project.version
                 from components.release

diff --git a/crystal-map-processor/build.gradle b/crystal-map-processor/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'maven-publish'
 apply plugin: 'jacoco'
 apply plugin: 'pmd'
 apply plugin: 'kotlin-kapt'
+apply plugin: 'java'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
@@ -26,14 +27,9 @@ dependencies {
 targetCompatibility = JavaVersion.VERSION_17
 sourceCompatibility = JavaVersion.VERSION_17
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
+java {
+    withSourcesJar()
+    withJavadocJar()
 }
 
 publishing {
@@ -66,21 +62,5 @@ jacocoTestReport {
     }
 }
 
-artifacts {
-    archives sourcesJar
-    archives javadocJar
-}
-
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
-
 
 
diff --git a/crystal-map-versioning-plugin/build.gradle b/crystal-map-versioning-plugin/build.gradle
@@ -14,34 +14,14 @@ gradlePlugin {
     }
 }
 
-task sourcesJar(type: Jar, dependsOn: classes) {
-    archiveClassifier = 'sources'
-    from sourceSets.main.allSource
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    archiveClassifier = 'javadoc'
-    from javadoc.destinationDir
-}
+targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_17
 
-artifacts {
-    archives sourcesJar
-    archives javadocJar
+java {
+    withSourcesJar()
+    withJavadocJar()
 }
 
-repositories {
-    mavenCentral()
-}
-compileKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
-compileTestKotlin {
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17
-    }
-}
 
 publishing {
     publications {