From 64e331cabbf7b3ecc237f1ffd3386732ceb74765 Mon Sep 17 00:00:00 2001
From: d-hrs <s1150199@gmail.com>
Date: Tue, 12 Dec 2023 15:51:47 +0900
Subject: [PATCH 1/4] use trocco-io/kintone-java-client

---
 build.gradle                                         |  2 +-
 shadow-kintone-java-client/build.gradle              |  9 ++++++++-
 .../dependency-locks/runtimeClasspath.lockfile       | 12 ++++++------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 158fd49..69e9722 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,7 +12,7 @@ repositories {
 }
 
 group = "io.trocco"
-version = "0.1.10"
+version = "0.1.11"
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
diff --git a/shadow-kintone-java-client/build.gradle b/shadow-kintone-java-client/build.gradle
index bc8abe4..c77dfab 100644
--- a/shadow-kintone-java-client/build.gradle
+++ b/shadow-kintone-java-client/build.gradle
@@ -6,6 +6,13 @@ plugins {
 
 repositories {
     mavenCentral()
+    maven {
+        url = uri("https://maven.pkg.github.com/trocco-io/kintone-java-client")
+        credentials {
+            username = project.findProperty("gpr.user") ?: System.getenv("USERNAME")
+            password = project.findProperty("gpr.key") ?: System.getenv("TOKEN")
+        }
+   }
 }
 
 group = "${rootProject.group}"
@@ -25,7 +32,7 @@ configurations {
 }
 
 dependencies {
-    compile "com.kintone:kintone-java-client:1.4.0"
+    compile "com.kintone:kintone-java-client:1.4.1-trocco-0.0.1"
 }
 
 shadowJar {
diff --git a/shadow-kintone-java-client/gradle/dependency-locks/runtimeClasspath.lockfile b/shadow-kintone-java-client/gradle/dependency-locks/runtimeClasspath.lockfile
index 904084a..db13d35 100644
--- a/shadow-kintone-java-client/gradle/dependency-locks/runtimeClasspath.lockfile
+++ b/shadow-kintone-java-client/gradle/dependency-locks/runtimeClasspath.lockfile
@@ -1,12 +1,12 @@
 # This is a Gradle generated file for dependency locking.
 # Manual edits can break the build and are not advised.
 # This file is expected to be part of source control.
-com.fasterxml.jackson.core:jackson-annotations:2.13.2
-com.fasterxml.jackson.core:jackson-core:2.13.2
-com.fasterxml.jackson.core:jackson-databind:2.13.2.2
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2
-com.fasterxml.jackson:jackson-bom:2.13.2
-com.kintone:kintone-java-client:1.4.0
+com.fasterxml.jackson.core:jackson-annotations:2.13.4
+com.fasterxml.jackson.core:jackson-core:2.13.4
+com.fasterxml.jackson.core:jackson-databind:2.13.4.2
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
+com.fasterxml.jackson:jackson-bom:2.13.4
+com.kintone:kintone-java-client:1.4.1-trocco-0.0.1
 commons-codec:commons-codec:1.15
 org.apache.httpcomponents.client5:httpclient5:5.1.3
 org.apache.httpcomponents.core5:httpcore5-h2:5.1.3

From 4bf1cf8d7f83c754626e7bc107e830b55864e3bf Mon Sep 17 00:00:00 2001
From: d-hrs <s1150199@gmail.com>
Date: Tue, 12 Dec 2023 16:29:44 +0900
Subject: [PATCH 2/4] pass env

---
 .github/workflows/gem-push.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/gem-push.yml b/.github/workflows/gem-push.yml
index f7bb584..7cdc84d 100644
--- a/.github/workflows/gem-push.yml
+++ b/.github/workflows/gem-push.yml
@@ -25,3 +25,6 @@ jobs:
           language: java
           gem-path: "./build/gems/*.gem"
           github-token: "${{ secrets.GITHUB_TOKEN }}"
+        env:
+          TOKEN: "${{ secrets.GPR_TOKEN }}"
+          USERNAME: "${{ secrets.GPR_USERNAME }}"

From 303928baf1b668f04b631abfc51425d0684122ef Mon Sep 17 00:00:00 2001
From: d-hrs <s1150199@gmail.com>
Date: Tue, 12 Dec 2023 17:09:21 +0900
Subject: [PATCH 3/4] retrieve the version from git tags

---
 build.gradle | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 69e9722..3e7afce 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,14 @@ repositories {
     mavenCentral()
 }
 
-group = "io.trocco"
-version = "0.1.11"
+version = {
+    def vd = versionDetails()
+    if (vd.commitDistance == 0 && vd.lastTag ==~ /^[0-9]+\.[0-9]+\.[0-9]$/) {
+        vd.lastTag
+    } else {
+        "0.0.0.${vd.gitHash}"
+    }
+}()
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

From bc0fa9cabf36147679c637df7902a87e2ca7b72c Mon Sep 17 00:00:00 2001
From: d-hrs <s1150199@gmail.com>
Date: Wed, 13 Dec 2023 10:04:26 +0900
Subject: [PATCH 4/4] add env vals to checks.yml

---
 .github/workflows/checks.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 4eae887..e47392a 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -14,6 +14,9 @@ on:
       - opened
       - synchronize
 
+env:
+  TOKEN: "${{ secrets.GPR_TOKEN }}"
+  USERNAME: "${{ secrets.GPR_USERNAME }}"
 jobs:
   checks:
     runs-on: ubuntu-latest