kotlin-orm · vincentlauvlwj · May 9, 2021 · Jan 9, 2021 · Jan 9, 2021 · Jan 9, 2021
diff --git a/.travis.yml b/.travis.yml
@@ -13,8 +13,7 @@ env:
 #  - psql -c "create database ktorm;" -U postgres
 
 after_success: 
-  - chmod +x auto-upload.sh
-  - ./auto-upload.sh
+  - ./gradlew publishDistPublicationToSnapshotRepository
 
 before_cache:
   - rm -f  "${HOME}/.gradle/caches/modules-2/modules-2.lock"

diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ For more documentation, go to our site: [https://www.ktorm.org](https://www.ktor
 
 # Quick Start
 
-Ktorm was deployed to maven central and jcenter, so you just need to add a dependency to your `pom.xml` file if you are using maven: 
+Ktorm was deployed to maven central, so you just need to add a dependency to your `pom.xml` file if you are using maven: 
 
 ```xml
 <dependency>

diff --git a/README_cn.md b/README_cn.md
@@ -42,7 +42,7 @@ Ktorm 是直接基于纯 JDBC 编写的高效简洁的轻量级 Kotlin ORM 框
 
 # 快速开始
 
-Ktorm 已经发布到 maven 中央仓库和 jcenter，因此，如果你使用 maven 的话，只需要在 `pom.xml` 文件里面添加一个依赖： 
+Ktorm 已经发布到 maven 中央仓库，因此，如果你使用 maven 的话，只需要在 `pom.xml` 文件里面添加一个依赖： 
 
 ```xml
 <dependency>

diff --git a/README_jp.md b/README_jp.md
@@ -42,7 +42,7 @@ Ktormは純粋なJDBCをベースにしたKotlin用の軽量で効率的なORM
 
 # クイックスタート
 
-Ktormはmaven centralとjcenterにデプロイされているので、mavenを使っている場合は `pom.xml` ファイルに依存関係を追加するだけです。
+Ktormはmaven centralにデプロイされているので、mavenを使っている場合は `pom.xml` ファイルに依存関係を追加するだけです。
 
 ```xml
 <dependency>

diff --git a/auto-upload.sh b/auto-upload.sh
diff --git a/build.gradle b/build.gradle
@@ -1,34 +1,33 @@
 
 buildscript {
     ext {
-        kotlinVersion = "1.4.21"
-        detektVersion = "1.12.0-RC1"
+        kotlinVersion = "1.4.32"
+        detektVersion = "1.17.0-RC2"
     }
     repositories {
-        jcenter()
+        mavenCentral()
         gradlePluginPortal()
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
-        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4"
         classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:${detektVersion}"
     }
 }
 
 allprojects {
     group = "org.ktorm"
-    version = "3.3.0"
+    version = "3.4.0"
 }
 
 subprojects { project ->
     apply plugin: "kotlin"
+    apply plugin: "signing"
     apply plugin: "maven-publish"
-    apply plugin: "com.jfrog.bintray"
     apply plugin: "io.gitlab.arturbosch.detekt"
     apply from: "${project.rootDir}/check-source-header.gradle"
 
     repositories {
-        jcenter()
+        mavenCentral()
     }
 
     dependencies {
@@ -47,7 +46,7 @@ subprojects { project ->
         ]
     }
 
-    task generateSourcesJar(type: Jar) {
+    task generateSources(type: Jar) {
         archiveClassifier = "sources"
         from sourceSets.main.allSource
     }
@@ -58,34 +57,36 @@ subprojects { project ->
 
     detekt {
         toolVersion = detektVersion
+        input = files("src/main/kotlin")
         config = files("${project.rootDir}/detekt.yml")
-        reports {
-            xml.enabled = false
-            html.enabled = false
-        }
     }
 
     publishing {
         publications {
-            bintray(MavenPublication) {
+            dist(MavenPublication) {
                 from components.java
-                artifact generateSourcesJar
+                artifact generateSources
                 artifact generateJavadoc
 
-                groupId project.group
-                artifactId project.name
-                version project.version
+                groupId = project.group
+                artifactId = project.name
+                version = project.version
 
                 pom {
-                    name = project.name
+                    name = "${project.group}:${project.name}"
                     description = "A lightweight ORM Framework for Kotlin with strong typed SQL DSL and sequence APIs."
-                    url = "https://github.com/kotlin-orm/ktorm"
+                    url = "https://www.ktorm.org"
                     licenses {
                         license {
                             name = "The Apache Software License, Version 2.0"
                             url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
                         }
                     }
+                    scm {
+                        url = "https://github.com/kotlin-orm/ktorm"
+                        connection = "scm:git:https://github.com/kotlin-orm/ktorm.git"
+                        developerConnection = "scm:git:ssh://git@github.com/kotlin-orm/ktorm.git"
+                    }
                     developers {
                         developer {
                             id = "vincentlauvlwj"
@@ -162,41 +163,45 @@ subprojects { project ->
                             name = "Pedro Domingues"
                             email = "pedro.domingues.pt@gmail.com"
                         }
-                    }
-                    scm {
-                        url = "https://github.com/kotlin-orm/ktorm.git"
+                        developer {
+                            id = "efenderbosch"
+                            name = "Eric Fenderbosch"
+                            email = "eric@fender.net"
+                        }
                     }
                 }
             }
         }
-    }
 
-    bintray {
-        user = System.getenv("BINTRAY_USER")
-        key = System.getenv("BINTRAY_KEY")
-        publications = ["bintray"]
-        publish = true
-
-        pkg {
-            repo = "ktorm"
-            name = project.name
-            licenses = ["Apache-2.0"]
-            vcsUrl = "https://github.com/kotlin-orm/ktorm.git"
-            labels = ["Kotlin", "ORM", "SQL"]
-
-            version {
-                name = project.version
-                released = new Date()
-                vcsTag = project.version
-
-                mavenCentralSync {
-                    sync = false
-                    user = System.getenv("OSSRH_USER")
+        repositories {
+            maven {
+                name = "central"
+                url = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
+                credentials {
+                    username = System.getenv("OSSRH_USER")
+                    password = System.getenv("OSSRH_PASSWORD")
+                }
+            }
+            maven {
+                name = "snapshot"
+                url = "https://oss.sonatype.org/content/repositories/snapshots"
+                credentials {
+                    username = System.getenv("OSSRH_USER")
                     password = System.getenv("OSSRH_PASSWORD")
                 }
             }
         }
     }
+
+    signing {
+        def keyId = System.getenv("GPG_KEY_ID")
+        def secretKey = System.getenv("GPG_SECRET_KEY")
+        def password = System.getenv("GPG_PASSWORD")
+
+        required { !project.version.endsWith("SNAPSHOT") }
+        useInMemoryPgpKeys(keyId, secretKey, password)
+        sign publishing.publications.dist
+    }
 }
 
 task printClasspath() {

diff --git a/detekt.yml b/detekt.yml
@@ -28,9 +28,9 @@ console-reports:
 comments:
   active: true
   CommentOverPrivateFunction:
-    active: true
+    active: false
   CommentOverPrivateProperty:
-    active: true
+    active: false
   EndOfSentenceFormat:
     active: true
     endOfSentenceFormat: ([.?!][ \t\n\r\f<])|([.?!]$)
@@ -50,7 +50,7 @@ complexity:
     threshold: 4
   ComplexInterface:
     active: true
-    threshold: 11
+    threshold: 12
     includeStaticDeclarations: false
   ComplexMethod:
     active: true
@@ -192,8 +192,7 @@ formatting:
   ImportOrdering:
     active: false
   Indentation:
-    # Temporarily disable the indentation rule as it doesn't work after upgrading detekt. https://github.com/detekt/detekt/issues/2970
-    active: false
+    active: true
     autoCorrect: false
     indentSize: 4
     continuationIndentSize: 4
@@ -242,7 +241,6 @@ formatting:
     active: true
     autoCorrect: false
   ParameterListWrapping:
-    # Temporarily disable this rule as it doesn't work after upgrading detekt. https://github.com/detekt/detekt/issues/2970
     active: false
     autoCorrect: false
     indentSize: 4
@@ -411,7 +409,7 @@ style:
     maxJumpCount: 2
   MagicNumber:
     active: true
-    ignoreNumbers: '-1,0,1,2'
+    ignoreNumbers: '-1,0,1,2,3'
     ignoreHashCodeFunction: true
     ignorePropertyDeclaration: false
     ignoreConstantDeclaration: true

diff --git a/ktorm-core/ktorm-core.gradle b/ktorm-core/ktorm-core.gradle
@@ -7,6 +7,7 @@ dependencies {
     compileOnly "com.google.android:android:1.5_r4"
     compileOnly "org.springframework:spring-jdbc:5.0.10.RELEASE"
     compileOnly "org.springframework:spring-tx:5.0.10.RELEASE"
+    compileOnly "org.postgresql:postgresql:42.2.5"
     testImplementation "com.h2database:h2:1.4.197"
 }