Merge branch 'main' into release

v0.1.3 release

buildSrc/build.gradle.kts

@@ -0,0 +1,17 @@
+repositories {
+    mavenLocal()
+    gradlePluginPortal()
+    maven {
+        url = uri("https://maven.pkg.github.com/huanshankeji/gradle-common")
+        credentials {
+            username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME")
+            password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN")
+        }
+    }
+}
+
+dependencies {
+    implementation(kotlin("gradle-plugin", "1.7.10"))
+    implementation("com.huanshankeji:common-gradle-dependencies:0.3.2-20220728")
+    implementation("com.huanshankeji.team:gradle-plugins:0.3.2")
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -205,6 +205,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

lib/build.gradle.kts

@@ -1,16 +1,22 @@
 import com.huanshankeji.CommonDependencies
 import com.huanshankeji.CommonVersions
+import com.huanshankeji.team.`Shreck Ye`
+import com.huanshankeji.team.pomForTeamDefaultOpenSource
+import com.huanshankeji.team.repositoriesAddTeamGithubPackagesMavenRegistry
 
 plugins {
+    id("com.huanshankeji.team.with-group")
     id("com.huanshankeji.kotlin-jvm-library-sonatype-ossrh-publish-conventions")
+    id("com.huanshankeji.team.default-github-packages-maven-publish")
 }
 
 repositories {
     mavenLocal()
     mavenCentral()
 }
+repositoriesAddTeamGithubPackagesMavenRegistry("kotlin-common")
 
-val commonVersions = CommonVersions()
+val commonVersions = CommonVersions(kotlinCommon = "0.2.4")
 val commonDependencies = CommonDependencies(commonVersions)
 
 dependencies {
@@ -39,35 +45,12 @@ dependencies {
     implementation(commonDependencies.vertx.moduleWithoutVersion("pg-client"))
 }
 
-version = "0.1.2"
+version = "0.1.3"
 
 publishing.publications.getByName<MavenPublication>("maven") {
     artifactId = rootProject.name + "-postgresql"
 
-    pom {
-        name.set("Exposed Vert.x SQL Client")
-        description.set("Exposed on top of Vert.x Reactive SQL Client")
-        val githubUrl = "https://github.com/huanshankeji/exposed-vertx-sql-client"
-        url.set(githubUrl)
-
-        licenses {
-            license {
-                name.set("The Apache License, Version 2.0")
-                url.set("http://www.apache.org/licenses/LICENSE-2.0.txt")
-            }
-        }
-        developers {
-            developer {
-                id.set("ShreckYe")
-                name.set("Shreck Ye")
-                email.set("[email protected]")
-            }
-        }
-        scm {
-            val scmString = "scm:git:$githubUrl.git"
-            connection.set(scmString)
-            developerConnection.set(scmString)
-            url.set(githubUrl)
-        }
+    pomForTeamDefaultOpenSource(project, "Exposed Vert.x SQL Client", "Exposed on top of Vert.x Reactive SQL Client") {
+        `Shreck Ye`()
     }
 }

settings.gradle.kts

@@ -1,14 +1,2 @@
 rootProject.name = "exposed-vertx-sql-client"
 include("lib")
-
-buildscript {
-    repositories {
-        mavenLocal()
-        gradlePluginPortal()
-    }
-    dependencies {
-        classpath(kotlin("gradle-plugin", "1.7.10"))
-        classpath("com.huanshankeji:common-gradle-dependencies:0.3.1-20220728")
-        classpath("com.huanshankeji:kotlin-common-gradle-plugins:0.1.9")
-    }
-}