Update to latest packaging (#3)

* update to latest packaging * fix versions in readme * update to latest java version in pipelines
LukasForst · Apr 12, 2022 · 676b7e2 · 676b7e2
1 parent 731fd37
commit 676b7e2
Show file tree

Hide file tree

Showing 10 changed files with 283 additions and 141 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os: [ windows-latest, ubuntu-latest ]
-        java: [ 8, 11, 16 ]
+        java: [ 8, 11, 17 ]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -23,12 +23,12 @@ Votes.insertOrUpdate(Votes.pollId, Votes.userId) {
 Library is hosted on Maven Central.
 ```xml
 <dependency>
-	<groupId>pw.forst</groupId>
+	<groupId>dev.forst</groupId>
 	<artifactId>exposed-upsert</artifactId>
-	<version>1.1.0</version>
+	<version>1.2.0</version>
 </dependency>
 ```
 Gradle:
 ```kotlin
-implementation("pw.forst", "exposed-upsert", "1.1.0")
+implementation("dev.forst", "exposed-upsert", "1.2.0")
 ```
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -2,34 +2,37 @@ import org.gradle.jvm.tasks.Jar
 import java.net.URL
 
 plugins {
-    kotlin("jvm") version "1.5.0"
+    kotlin("jvm") version "1.6.20"
 
     `maven-publish`
     signing
     id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
 
-    id("net.nemerosa.versioning") version "2.14.0"
-    id("org.jetbrains.dokka") version "1.4.32"
-    id("io.gitlab.arturbosch.detekt") version "1.17.0"
+    id("net.nemerosa.versioning") version "2.15.1"
+    id("org.jetbrains.dokka") version "1.6.10"
+    id("io.gitlab.arturbosch.detekt") version "1.19.0"
 }
 
-group = "pw.forst"
-base.archivesBaseName = "exposed-upsert"
+
+group = "dev.forst"
+base.archivesName.set("exposed-upsert")
+version = (versioning.info?.tag ?: versioning.info?.lastTag ?: versioning.info?.build) ?: "SNAPSHOT"
 version = (versioning.info?.tag ?: versioning.info?.lastTag ?: versioning.info?.build) ?: "SNAPSHOT"
 
 repositories {
     mavenCentral()
 }
 
 dependencies {
+    compileOnly(kotlin("reflect"))
     compileOnly(kotlin("stdlib-jdk8"))
-    compileOnly("org.jetbrains.exposed", "exposed-core", "0.31.1")
-    compileOnly("org.jetbrains.kotlin", "kotlin-reflect", "1.5.0")
+
+    compileOnly("org.jetbrains.exposed", "exposed-core", "0.37.3")
 }
 
 detekt {
     parallel = true
-    input = files("$rootDir/src")
+    source = files("$rootDir/src")
     config = files(rootDir.resolve("detekt-config.yml"))
 }
 
@@ -87,19 +90,19 @@ publishing {
             pom {
                 name.set("exposed-upsert")
                 description.set("Simple upsert implementation for Exposed and PostgreSQL.")
-                url.set("https://exposed-upsert.forst.pw")
+                url.set("https://exposed.forst.dev")
                 packaging = "jar"
                 licenses {
                     license {
                         name.set("MIT")
-                        url.set("https://mit-license.org/license.txt")
+                        url.set("https://github.com/LukasForst/exposed-upsert/blob/master/LICENSE")
                     }
                 }
                 developers {
                     developer {
                         id.set("lukasforst")
                         name.set("Lukas Forst")
-                        email.set("lukas@forst.pw")
+                        email.set("lukas@forst.dev")
                     }
                 }
                 scm {