From 0697d29418ac64c6ee8b0db6db6303694ebaabfd Mon Sep 17 00:00:00 2001 From: ssk Date: Tue, 21 Apr 2026 10:43:47 +0900 Subject: [PATCH 01/17] =?UTF-8?q?chore:=20JDK=2021=20=EC=97=85=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Gradle wrapper 7.2 → 8.10.2 - Kotlin 1.9.0 → 2.0.21 - 루트 플러그인 JvmTarget 17 → 21 - example AGP 7.3.1 → 8.6.1, compileSdk 33 → 34, minSdk 16 → 21 - example/app JavaVersion 17 → 21, namespace 속성 추가 (AGP 8 필수) - AndroidManifest의 package 속성 제거 (namespace로 이관) - CI JDK 17 → 21 - 플러그인 version 1.1.0.14 → 1.2.0.15 (Java 버전 변경 consumer breaking change) Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 4 ++-- build.gradle.kts | 6 +++--- example/app/build.gradle.kts | 14 +++++++------- example/app/src/main/AndroidManifest.xml | 3 +-- example/build.gradle.kts | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 17 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 420f726..d40724e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,11 +18,11 @@ jobs: - name: Checkout uses: actions/checkout@v4 - - name: Set up JDK 17 + - name: Set up JDK 21 uses: actions/setup-java@v4 with: distribution: temurin - java-version: '17' + java-version: '21' - name: Validate Gradle wrapper uses: gradle/actions/wrapper-validation@v4 diff --git a/build.gradle.kts b/build.gradle.kts index 69230b2..89caded 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,11 +3,11 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { `java-gradle-plugin` - kotlin("jvm") version "1.9.0" + kotlin("jvm") version "2.0.21" } group = "com.rsupport" -version = "1.1.0.14" +version = "1.2.0.15" repositories { mavenCentral() @@ -46,6 +46,6 @@ gradlePlugin { tasks.withType().configureEach { compilerOptions { - jvmTarget.set(JvmTarget.JVM_17) + jvmTarget.set(JvmTarget.JVM_21) } } diff --git a/example/app/build.gradle.kts b/example/app/build.gradle.kts index 6dd850f..577e7c5 100644 --- a/example/app/build.gradle.kts +++ b/example/app/build.gradle.kts @@ -6,13 +6,13 @@ plugins { } android { - compileSdk = 33 - buildToolsVersion = "30.0.3" + namespace = "example.app" + compileSdk = 34 defaultConfig { applicationId = "example.app" - minSdk = 16 - targetSdk = 33 + minSdk = 21 + targetSdk = 34 versionCode = 1 versionName = "1.0" @@ -29,11 +29,11 @@ android { } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlinOptions { - jvmTarget = "17" + jvmTarget = "21" } } diff --git a/example/app/src/main/AndroidManifest.xml b/example/app/src/main/AndroidManifest.xml index 18213c9..61c79a0 100644 --- a/example/app/src/main/AndroidManifest.xml +++ b/example/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + Date: Tue, 21 Apr 2026 11:04:01 +0900 Subject: [PATCH 02/17] =?UTF-8?q?ci:=20example=20=EC=95=B1=20=EB=B9=8C?= =?UTF-8?q?=EB=93=9C=20CI=20=EC=9E=A1=20=EC=B6=94=EA=B0=80=20+=20composite?= =?UTF-8?q?=20build=20=EC=A0=95=ED=95=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - example/settings.gradle.kts: pluginManagement { includeBuild("..") }로 현재 저장소의 플러그인을 composite 빌드에서 직접 사용 (미배포 버전 검증 가능) - example/build.gradle.kts: 미배포 JitPack classpath 제거, plugins DSL로 AGP/Kotlin 버전만 명시 - example/app: apply(plugin=...) + configure → plugins { id("android-string-table") } + 타입 안전 accessor androidStringTable { ... } - example Gradle wrapper 7.4 → 8.10.2 (AGP 8.6.1 요구) - 의존성 버전 일괄 최신화 (compileSdk 34 대응) - CI: "Example App Build" job 추가 — setup-android 후 ./gradlew :app:assembleDebug 실행 Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 23 ++++++++++++++++++ example/app/build.gradle.kts | 24 ++++++++----------- example/app/src/main/AndroidManifest.xml | 4 +++- example/build.gradle.kts | 22 +++-------------- .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/settings.gradle.kts | 17 +++++++++++++ 6 files changed, 57 insertions(+), 35 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d40724e..bcf9bf7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,3 +43,26 @@ jobs: name: test-report path: build/reports/tests/test retention-days: 7 + + example: + name: Example App Build + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '21' + + - name: Set up Android SDK + uses: android-actions/setup-android@v3 + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build example app (composite build of plugin) + working-directory: example + run: ./gradlew :app:assembleDebug --stacktrace diff --git a/example/app/build.gradle.kts b/example/app/build.gradle.kts index 577e7c5..b60e448 100644 --- a/example/app/build.gradle.kts +++ b/example/app/build.gradle.kts @@ -1,8 +1,7 @@ -import com.rsupport.plugin.StringTableExtension - plugins { id("com.android.application") - id("kotlin-android") + id("org.jetbrains.kotlin.android") + id("android-string-table") } android { @@ -38,19 +37,16 @@ android { } dependencies { - val kotlinVersion = rootProject.extra["kotlin_version"] as String - implementation("org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion") - implementation("androidx.core:core-ktx:1.3.2") - implementation("androidx.appcompat:appcompat:1.2.0") - implementation("com.google.android.material:material:1.3.0") - implementation("androidx.constraintlayout:constraintlayout:2.0.4") - testImplementation("junit:junit:4.+") - androidTestImplementation("androidx.test.ext:junit:1.1.2") - androidTestImplementation("androidx.test.espresso:espresso-core:3.3.0") + implementation("androidx.core:core-ktx:1.13.1") + implementation("androidx.appcompat:appcompat:1.7.0") + implementation("com.google.android.material:material:1.12.0") + implementation("androidx.constraintlayout:constraintlayout:2.1.4") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.2.1") + androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1") } -apply(plugin = "android-string-table") -configure { +androidStringTable { googleDriveCredentialPath.set("${project.rootDir}/app/i18n/credentials.json") targetSheetUrl.set("https://docs.google.com/spreadsheets/d/12hmQ7U0npYM4hK4ck3qN9bMUDRu-ZcPueluxz5X4w30/edit#gid=1661361434") outputXlsxFilePath.set("${project.rootDir}/app/i18n/languages.xlsx") diff --git a/example/app/src/main/AndroidManifest.xml b/example/app/src/main/AndroidManifest.xml index 61c79a0..d6932de 100644 --- a/example/app/src/main/AndroidManifest.xml +++ b/example/app/src/main/AndroidManifest.xml @@ -8,7 +8,9 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.StringTableExampleApp"> - + diff --git a/example/build.gradle.kts b/example/build.gradle.kts index e74bc59..2137265 100644 --- a/example/build.gradle.kts +++ b/example/build.gradle.kts @@ -1,22 +1,6 @@ -buildscript { - extra["kotlin_version"] = "2.0.21" - repositories { - google() - mavenCentral() - maven(url = "https://jitpack.io") - } - dependencies { - classpath("com.android.tools.build:gradle:8.6.1") - classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${extra["kotlin_version"]}") - classpath("com.github.rsupportrnd:android-string-table:1.2.0.15") - } -} - -allprojects { - repositories { - google() - mavenCentral() - } +plugins { + id("com.android.application") version "8.6.1" apply false + id("org.jetbrains.kotlin.android") version "2.0.21" apply false } tasks.register("clean") { diff --git a/example/gradle/wrapper/gradle-wrapper.properties b/example/gradle/wrapper/gradle-wrapper.properties index 66d996c..367c80d 100644 --- a/example/gradle/wrapper/gradle-wrapper.properties +++ b/example/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip diff --git a/example/settings.gradle.kts b/example/settings.gradle.kts index 721a73e..a21f296 100644 --- a/example/settings.gradle.kts +++ b/example/settings.gradle.kts @@ -1,2 +1,19 @@ +pluginManagement { + includeBuild("..") + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + google() + mavenCentral() + } +} + include(":app") rootProject.name = "StringTableExampleApp" From 7c12234f4b39b81f27601b4032bebafa946520e4 Mon Sep 17 00:00:00 2001 From: ssk Date: Tue, 21 Apr 2026 11:55:14 +0900 Subject: [PATCH 03/17] =?UTF-8?q?ci:=20check=20=ED=83=9C=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=20=ED=86=B5=ED=95=A9=20+=20Dependabot=20+=20CodeQL=20=EC=8A=A4?= =?UTF-8?q?=EC=BA=94=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ./gradlew test → ./gradlew check 로 교체 (향후 lint 태스크 자동 포함) - .github/dependabot.yml: 루트/example Gradle + GitHub Actions 주간 업데이트 PR - .github/workflows/codeql.yml: Java/Kotlin 정적 보안 분석 (push/PR/월요일 03:00 UTC) Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/dependabot.yml | 22 ++++++++++++++++++ .github/workflows/ci.yml | 7 ++---- .github/workflows/codeql.yml | 43 ++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 5 deletions(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/codeql.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..7b4c10c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,22 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + groups: + gradle-plugin-deps: + patterns: + - "*" + + - package-ecosystem: "gradle" + directory: "/example" + schedule: + interval: "weekly" + open-pull-requests-limit: 5 + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bcf9bf7..adda7fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,11 +30,8 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - - name: Compile - run: ./gradlew compileKotlin compileTestKotlin --stacktrace - - - name: Test - run: ./gradlew test --stacktrace + - name: Check (compile + test + 추후 lint) + run: ./gradlew check --stacktrace - name: Upload test report if: failure() diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..bcc8147 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,43 @@ +name: CodeQL + +on: + push: + branches: [main] + pull_request: + branches: [main] + schedule: + - cron: "0 3 * * 1" + +jobs: + analyze: + name: Analyze (Java/Kotlin) + runs-on: ubuntu-latest + permissions: + actions: read + contents: read + security-events: write + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '21' + + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: java-kotlin + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build for analysis + run: ./gradlew compileKotlin --no-daemon + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:java-kotlin" From 99d28c1de7739b285778f501575ebd1be10d5237 Mon Sep 17 00:00:00 2001 From: ssk Date: Tue, 21 Apr 2026 11:58:44 +0900 Subject: [PATCH 04/17] =?UTF-8?q?ci:=20CodeQL=20=EC=9E=A1=EC=97=90=20GRADL?= =?UTF-8?q?E=5FOPTS=20=ED=9E=99=20=EC=A6=9D=EC=84=A4=20(Kotlin=20extractor?= =?UTF-8?q?=20OOM=20=EB=8C=80=EC=9D=91)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/codeql.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bcc8147..9d2ec57 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -35,6 +35,8 @@ jobs: uses: gradle/actions/setup-gradle@v4 - name: Build for analysis + env: + GRADLE_OPTS: "-Xmx4g -XX:MaxMetaspaceSize=1g" run: ./gradlew compileKotlin --no-daemon - name: Perform CodeQL Analysis From 820a113ca88caa5f27496cd30d871a3c1795d0c9 Mon Sep 17 00:00:00 2001 From: ssk Date: Tue, 21 Apr 2026 12:02:29 +0900 Subject: [PATCH 05/17] =?UTF-8?q?ci:=20CodeQL=20autobuild=20+=20=5FJAVA=5F?= =?UTF-8?q?OPTIONS=20=EB=A1=9C=20OOM=20=EC=9E=AC=EB=B0=9C=20=EB=B0=A9?= =?UTF-8?q?=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Kotlin 컴파일러는 별도 데몬이라 GRADLE_OPTS가 전파되지 않음 - _JAVA_OPTIONS=-Xmx5g 로 모든 자식 JVM 힙 확대 - 수동 compileKotlin → codeql-action/autobuild 로 단순화 Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 9d2ec57..1b311d4 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -34,10 +34,10 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 - - name: Build for analysis + - name: Autobuild + uses: github/codeql-action/autobuild@v3 env: - GRADLE_OPTS: "-Xmx4g -XX:MaxMetaspaceSize=1g" - run: ./gradlew compileKotlin --no-daemon + _JAVA_OPTIONS: "-Xmx5g" - name: Perform CodeQL Analysis uses: github/codeql-action/analyze@v3 From 60f3d3b5d873e8bdebae795efd129d2ce987bd83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 17:43:16 +0900 Subject: [PATCH 06/17] =?UTF-8?q?ci:=20example=20=EA=B2=80=EC=A6=9D=20?= =?UTF-8?q?=EA=B0=95=ED=99=94=20+=20credential-gated=20E2E=20=EC=9E=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - :app:tasks --group 로 플러그인 태스크 3개 등록 smoke test - :app:lintDebug 실행, 실패 시 HTML 리포트 아티팩트 업로드 - E2E 잡: GDRIVE_CREDENTIALS_JSON/GDRIVE_TOKENS_TAR_B64 있을 때만 :app:updateResource 실행 후 생성 XML 검증 - 시크릿 미설정 / 포크 PR 자동 스킵 - example APK 아티팩트 업로드 (example-app-debug) Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 98 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index adda7fb..06884c8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,104 @@ jobs: - name: Set up Gradle uses: gradle/actions/setup-gradle@v4 + - name: Verify plugin tasks registered + working-directory: example + run: | + ./gradlew :app:tasks --group androidStringTable | tee tasks.txt + grep -qw downloadSpreadsheet tasks.txt + grep -qw generateStringsXmls tasks.txt + grep -qw updateResource tasks.txt + + - name: Lint example app + working-directory: example + run: ./gradlew :app:lintDebug --stacktrace + - name: Build example app (composite build of plugin) working-directory: example run: ./gradlew :app:assembleDebug --stacktrace + + - name: Upload example APK + if: success() + uses: actions/upload-artifact@v4 + with: + name: example-app-debug + path: example/app/build/outputs/apk/debug/*.apk + retention-days: 7 + + - name: Upload lint report + if: failure() + uses: actions/upload-artifact@v4 + with: + name: example-lint-report + path: example/app/build/reports/lint-results-*.html + retention-days: 7 + + e2e: + name: Plugin E2E (Google Drive) + runs-on: ubuntu-latest + needs: example + # forks can't access secrets; skip for cross-repo PRs + if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Determine credentials presence + id: creds + env: + HAS_CREDS: ${{ secrets.GDRIVE_CREDENTIALS_JSON != '' && secrets.GDRIVE_TOKENS_TAR_B64 != '' }} + run: echo "has=$HAS_CREDS" >> "$GITHUB_OUTPUT" + + - name: Skip notice + if: steps.creds.outputs.has != 'true' + run: echo "::notice::GDRIVE_CREDENTIALS_JSON / GDRIVE_TOKENS_TAR_B64 secret 미설정 — E2E 스킵" + + - name: Set up JDK 21 + if: steps.creds.outputs.has == 'true' + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: '21' + + - name: Set up Android SDK + if: steps.creds.outputs.has == 'true' + uses: android-actions/setup-android@v3 + + - name: Set up Gradle + if: steps.creds.outputs.has == 'true' + uses: gradle/actions/setup-gradle@v4 + + - name: Restore credentials + if: steps.creds.outputs.has == 'true' + working-directory: example + env: + GDRIVE_CREDENTIALS_JSON: ${{ secrets.GDRIVE_CREDENTIALS_JSON }} + GDRIVE_TOKENS_TAR_B64: ${{ secrets.GDRIVE_TOKENS_TAR_B64 }} + run: | + mkdir -p app/i18n + printf '%s' "$GDRIVE_CREDENTIALS_JSON" > app/i18n/credentials.json + echo "$GDRIVE_TOKENS_TAR_B64" | base64 -d | tar xz + test -d drive_all_tokens + + - name: Run plugin E2E (:app:updateResource) + if: steps.creds.outputs.has == 'true' + working-directory: example + run: ./gradlew :app:updateResource --stacktrace + + - name: Verify generated XML + if: steps.creds.outputs.has == 'true' + working-directory: example/app/src/main/res + run: | + test -f values/strings_generated.xml + test -s values/strings_generated.xml + xmllint --noout values/strings_generated.xml + variants=$(ls -d values-* 2>/dev/null | wc -l | tr -d ' ') + echo "locale variants found: $variants" + test "$variants" -ge 1 + + - name: Cleanup credentials + if: always() && steps.creds.outputs.has == 'true' + working-directory: example + run: | + rm -f app/i18n/credentials.json + rm -rf drive_all_tokens From 23391fb69e7c306bc71fdc64ef54b6089493d98d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 19:05:15 +0900 Subject: [PATCH 07/17] =?UTF-8?q?fix:=20commons-io=202.18.0=20=EB=AA=85?= =?UTF-8?q?=EC=8B=9C=20+=20JVM=20toolchain=2021=20+=20commons-codec=20?= =?UTF-8?q?=EC=B5=9C=EC=8B=A0=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - commons-io:2.18.0 를 api 로 명시 선언 + resolutionStrategy.force 로 composite build 소비자 classpath 에서도 POI 5.4.1 이 요구하는 BoundedInputStream.builder() API 가 반드시 로드되도록 보장 - commons-codec:1.5 (2010) → 1.18.0 - kotlin { jvmToolchain(21) } 로 Java/Kotlin 컴파일 타겟 동시 고정 - settings.gradle.kts 에 foojay-resolver-convention 추가 — 로컬 JDK 17 환경에서도 Gradle 이 JDK 21 을 자동 프로비저닝해 이 PR 을 로컬에서 검증 가능하게 함 Co-Authored-By: Claude Opus 4.7 (1M context) --- build.gradle.kts | 25 +++++++++++++++---------- settings.gradle.kts | 4 ++++ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 89caded..d25bdfc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,6 +1,3 @@ -import org.jetbrains.kotlin.gradle.dsl.JvmTarget -import org.jetbrains.kotlin.gradle.tasks.KotlinCompile - plugins { `java-gradle-plugin` kotlin("jvm") version "2.0.21" @@ -13,13 +10,18 @@ repositories { mavenCentral() } +kotlin { + jvmToolchain(21) +} + dependencies { testImplementation("junit:junit:4.12") testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-core:1.3") api("org.apache.poi:poi:5.4.1") - api("commons-codec:commons-codec:1.5") api("org.apache.poi:poi-ooxml:5.4.1") + api("commons-io:commons-io:2.18.0") + api("commons-codec:commons-codec:1.18.0") api("org.apache.xmlbeans:xmlbeans:2.3.0") api("stax:stax-api:1.0.1") api("dom4j:dom4j:1.6.1") @@ -35,6 +37,15 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") } +configurations.all { + resolutionStrategy { + force( + "commons-io:commons-io:2.18.0", + "commons-codec:commons-codec:1.18.0", + ) + } +} + gradlePlugin { plugins { create("stringTablePlugin") { @@ -43,9 +54,3 @@ gradlePlugin { } } } - -tasks.withType().configureEach { - compilerOptions { - jvmTarget.set(JvmTarget.JVM_21) - } -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 6ada047..f6b1fb7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1 +1,5 @@ +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0" +} + rootProject.name = "android-string-table" From e88d53730917009d75101a4caf9e6f61ce5eb455 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:12:37 +0900 Subject: [PATCH 08/17] =?UTF-8?q?fix:=20POI=205.4.1=20=E2=86=92=205.2.5=20?= =?UTF-8?q?(Gradle=20=EB=B2=88=EB=93=A4=20commons-io=202.15.1=20classloade?= =?UTF-8?q?r=20shadowing=20=ED=9A=8C=ED=94=BC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gradle 8.10.2 ~ 9.4 모두 lib/ 에 commons-io-2.15.1.jar 를 번들하고, 이게 플러그인 classloader 의 parent 라 어떤 상위 버전을 api/force 로 선언해도 parent-first 위임 때문에 2.15.1 이 이긴다. POI 5.4.1 은 commons-io 2.18.0 의 BoundedInputStream.builder() 를 호출해 composite build 소비자에서 NoSuchMethodError 가 발생한다. POI 5.2.5 가 commons-io 2.15.1 을 마지막으로 지원하는 POI 버전이라 이걸로 정렬하면 shadowing 상태에서도 충돌 없음. 이전 커밋(23391fb)의 commons-io:2.18.0 / commons-codec:1.18.0 명시와 resolutionStrategy.force 는 실제로 효과가 없었음이 확인되어 제거. Co-Authored-By: Claude Opus 4.7 (1M context) --- build.gradle.kts | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index d25bdfc..709405a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -18,10 +18,10 @@ dependencies { testImplementation("junit:junit:4.12") testImplementation("org.hamcrest:hamcrest-library:1.3") testImplementation("org.hamcrest:hamcrest-core:1.3") - api("org.apache.poi:poi:5.4.1") - api("org.apache.poi:poi-ooxml:5.4.1") - api("commons-io:commons-io:2.18.0") - api("commons-codec:commons-codec:1.18.0") + // POI 5.2.5 is the last version aligned with commons-io 2.15.1, which Gradle bundles + // on its core classloader; newer POI triggers NoSuchMethodError on BoundedInputStream.builder() + api("org.apache.poi:poi:5.2.5") + api("org.apache.poi:poi-ooxml:5.2.5") api("org.apache.xmlbeans:xmlbeans:2.3.0") api("stax:stax-api:1.0.1") api("dom4j:dom4j:1.6.1") @@ -37,15 +37,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8") } -configurations.all { - resolutionStrategy { - force( - "commons-io:commons-io:2.18.0", - "commons-codec:commons-codec:1.18.0", - ) - } -} - gradlePlugin { plugins { create("stringTablePlugin") { From 11aeadd4d3d851a3d6404a9844a2d1427ae24bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:20:47 +0900 Subject: [PATCH 09/17] =?UTF-8?q?ci:=20E2E=20=EC=9E=A1=20--no-daemon=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(=ED=86=A0=ED=81=B0=20CWD=20=EC=A0=95?= =?UTF-8?q?=ED=95=A9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 플러그인의 GoogleCredentials 가 토큰을 상대경로 "drive_all_tokens/" 아래에 저장/조회하는데, Gradle daemon 모드에서는 JVM CWD 가 ~/.gradle/daemon// 이라 워크플로우가 example/drive_all_tokens/ 로 복원한 토큰을 daemon 이 찾지 못한다. --no-daemon 으로 실행하면 JVM CWD = 쉘 CWD (working-directory: example) 가 되어 복원 경로와 daemon 조회 경로가 일치한다. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 06884c8..f03c2d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -142,7 +142,10 @@ jobs: - name: Run plugin E2E (:app:updateResource) if: steps.creds.outputs.has == 'true' working-directory: example - run: ./gradlew :app:updateResource --stacktrace + # --no-daemon: plugin stores OAuth tokens relative to JVM CWD; daemon CWD + # is ~/.gradle/daemon// so tokens restored to example/drive_all_tokens/ + # only match when Gradle runs in-process with the shell CWD. + run: ./gradlew :app:updateResource --no-daemon --stacktrace - name: Verify generated XML if: steps.creds.outputs.has == 'true' From 214275f78cc31ede935e932af5ff774697123e99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:24:26 +0900 Subject: [PATCH 10/17] =?UTF-8?q?fix:=20OAuth=20=ED=86=A0=ED=81=B0=20?= =?UTF-8?q?=EA=B2=BD=EB=A1=9C=EB=A5=BC=20credentials.json=20=EC=98=86?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EA=B3=A0=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 기존 GoogleCredentials 는 토큰 데이터 스토어를 상대경로 "drive_all_tokens/" 로 저장해서, 실제 저장 위치가 JVM CWD 에 따라 달라졌다: - Gradle daemon 모드: ~/.gradle/daemon//drive_all_tokens/ - --no-daemon: 쉘 CWD/drive_all_tokens/ 그래서 (1) Gradle 버전 올리면 토큰 무효화, (2) CI 에서 토큰 복원 경로를 daemon 동작에 맞춰 추정해야 하는 문제가 있었다. File(credentialFile.parentFile, "drive_all_tokens") 로 credentials.json 옆에 저장하도록 변경. 이제 로컬/CI 모두 동일한 절대 경로에서 토큰을 찾고, Gradle daemon 재시작/버전 변경에도 토큰 재사용 가능. 부수 변경: - CI E2E 잡: tokens 복원 경로를 example/app/i18n/drive_all_tokens/ 로 변경, --no-daemon 불필요해서 제거 - example/.gitignore 에 app/i18n/credentials.json 추가 (실수 커밋 방지) Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 14 +++++--------- example/.gitignore | 3 ++- .../java/com/rsupport/google/GoogleCredentials.kt | 11 ++++++++--- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f03c2d3..650dee4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -129,23 +129,19 @@ jobs: - name: Restore credentials if: steps.creds.outputs.has == 'true' - working-directory: example + working-directory: example/app/i18n env: GDRIVE_CREDENTIALS_JSON: ${{ secrets.GDRIVE_CREDENTIALS_JSON }} GDRIVE_TOKENS_TAR_B64: ${{ secrets.GDRIVE_TOKENS_TAR_B64 }} run: | - mkdir -p app/i18n - printf '%s' "$GDRIVE_CREDENTIALS_JSON" > app/i18n/credentials.json + printf '%s' "$GDRIVE_CREDENTIALS_JSON" > credentials.json echo "$GDRIVE_TOKENS_TAR_B64" | base64 -d | tar xz test -d drive_all_tokens - name: Run plugin E2E (:app:updateResource) if: steps.creds.outputs.has == 'true' working-directory: example - # --no-daemon: plugin stores OAuth tokens relative to JVM CWD; daemon CWD - # is ~/.gradle/daemon// so tokens restored to example/drive_all_tokens/ - # only match when Gradle runs in-process with the shell CWD. - run: ./gradlew :app:updateResource --no-daemon --stacktrace + run: ./gradlew :app:updateResource --stacktrace - name: Verify generated XML if: steps.creds.outputs.has == 'true' @@ -160,7 +156,7 @@ jobs: - name: Cleanup credentials if: always() && steps.creds.outputs.has == 'true' - working-directory: example + working-directory: example/app/i18n run: | - rm -f app/i18n/credentials.json + rm -f credentials.json rm -rf drive_all_tokens diff --git a/example/.gitignore b/example/.gitignore index 06358d7..ccc23c8 100644 --- a/example/.gitignore +++ b/example/.gitignore @@ -13,4 +13,5 @@ .externalNativeBuild .cxx local.properties -drive_all_tokens/ \ No newline at end of file +drive_all_tokens/ +app/i18n/credentials.json \ No newline at end of file diff --git a/src/main/java/com/rsupport/google/GoogleCredentials.kt b/src/main/java/com/rsupport/google/GoogleCredentials.kt index 44349ba..06f2ee0 100644 --- a/src/main/java/com/rsupport/google/GoogleCredentials.kt +++ b/src/main/java/com/rsupport/google/GoogleCredentials.kt @@ -17,15 +17,20 @@ import com.google.api.services.drive.DriveScopes object GoogleCredentials { private val JSON_FACTORY: JsonFactory = JacksonFactory.getDefaultInstance() - private const val TOKENS_DIRECTORY_PATH = "drive_all_tokens" + private const val TOKENS_DIRECTORY_NAME = "drive_all_tokens" private val SCOPES = listOf(DriveScopes.DRIVE, SheetsScopes.DRIVE_READONLY) private val HTTP_TRANSPORT = GoogleNetHttpTransport.newTrustedTransport() fun createCredentials(credentialFilePath: String): Credential { if(credentialFilePath.isEmpty()) throw IllegalStateException("Credential File Path is Empty.") - val clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, InputStreamReader(FileInputStream(credentialFilePath))) + val credentialFile = File(credentialFilePath) + // Store tokens next to credentials.json so the path is stable across Gradle + // daemon restarts and runner environments (relative paths resolve against the + // daemon JVM CWD, which varies by Gradle version). + val tokensDir = File(credentialFile.parentFile ?: File("."), TOKENS_DIRECTORY_NAME) + val clientSecrets = GoogleClientSecrets.load(JSON_FACTORY, InputStreamReader(FileInputStream(credentialFile))) val flow = GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY, clientSecrets, SCOPES) - .setDataStoreFactory(FileDataStoreFactory(File(TOKENS_DIRECTORY_PATH))) + .setDataStoreFactory(FileDataStoreFactory(tokensDir)) .setAccessType("offline") .build() val receiver = LocalServerReceiver.Builder().setPort(8888).build() From 825c8f0d0dcf4a9fa05548fbbc0bd5f870ca2b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:40:59 +0900 Subject: [PATCH 11/17] =?UTF-8?q?ci:=20example=20lint=206=EA=B0=9C=20check?= =?UTF-8?q?=20disable=20+=20=EB=A6=AC=ED=8F=AC=ED=8A=B8=20=EC=83=81?= =?UTF-8?q?=EC=8B=9C=20=EC=97=85=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit example 앱은 플러그인 데모 용도라 production Android 앱에서나 의미 있는 다음 6개 lint 체크가 30 errors 로 쌓여 CI 를 깨뜨림. 플러그인 품질과 무관한 신호라 선택적으로 끄는 쪽으로 정리: - MissingTranslation: 예제 xlsx 가 의도적으로 일부 로케일만 포함 - OldTargetApi: targetSdk 는 별도 bump 사이클 - GradleDependency: Dependabot 담당 - ObsoleteSdkInt: 예제 앱에서 조치 대상 아님 - UnusedResources: 플러그인 출력 중 일부만 쓰는 게 자연스러움 - MonochromeLauncherIcon: 데모 범위 밖 AGP 8 마이그레이션 회귀 감지라는 lint 의 본래 목적은 유지. 기타 lint 이슈가 생기면 abortOnError=true(기본) 로 CI 가 잡아냄. lint 리포트 업로드를 if: failure() → if: always() 로 전환해 통과 시에도 HTML 리포트를 확인할 수 있게 함. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 2 +- example/app/build.gradle.kts | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 650dee4..586d3ba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -85,7 +85,7 @@ jobs: retention-days: 7 - name: Upload lint report - if: failure() + if: always() uses: actions/upload-artifact@v4 with: name: example-lint-report diff --git a/example/app/build.gradle.kts b/example/app/build.gradle.kts index b60e448..59e9a64 100644 --- a/example/app/build.gradle.kts +++ b/example/app/build.gradle.kts @@ -34,6 +34,18 @@ android { kotlinOptions { jvmTarget = "21" } + lint { + // example app is a plugin demo, not a production app; suppress checks that + // don't reflect plugin quality or are managed elsewhere + disable += setOf( + "MissingTranslation", // example xlsx intentionally has partial locale coverage + "OldTargetApi", // targetSdk bumps tracked separately + "GradleDependency", // Dependabot handles AndroidX version currency + "ObsoleteSdkInt", // not actionable in example app + "UnusedResources", // example only consumes a subset of generated strings + "MonochromeLauncherIcon", // out of scope for plugin demo + ) + } } dependencies { From d365c11da4d7b8b31b6847af55b65d25debc9138 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:43:32 +0900 Subject: [PATCH 12/17] =?UTF-8?q?chore:=20example=20compileSdk/targetSdk?= =?UTF-8?q?=2034=20=E2=86=92=2036=20(Android=2016)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit AGP 8.6.1 + JDK 21 toolchain 환경에서 compileSdk/targetSdk 36 빌드 및 lintDebug 검증 통과 확인. 플러그인 소비자가 현 세대 Android 타겟을 쓰고 있음을 시사하려면 이 쪽이 합리적 default. Co-Authored-By: Claude Opus 4.7 (1M context) --- example/app/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/example/app/build.gradle.kts b/example/app/build.gradle.kts index 59e9a64..587871a 100644 --- a/example/app/build.gradle.kts +++ b/example/app/build.gradle.kts @@ -6,12 +6,12 @@ plugins { android { namespace = "example.app" - compileSdk = 34 + compileSdk = 36 defaultConfig { applicationId = "example.app" minSdk = 21 - targetSdk = 34 + targetSdk = 36 versionCode = 1 versionName = "1.0" From 32ef6edbd2583d40f01bee35d3eef1415a397173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:44:00 +0900 Subject: [PATCH 13/17] =?UTF-8?q?ci:=20CodeQL=20=EC=9B=8C=ED=81=AC?= =?UTF-8?q?=ED=94=8C=EB=A1=9C=EC=9A=B0=EC=97=90=EB=8F=84=20concurrency=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI 워크플로우와 동일하게 같은 ref 에 새 실행이 올라오면 진행 중인 이전 실행을 자동 취소해 러너 리소스와 대기열 시간 절감. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/codeql.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 1b311d4..0b17482 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -8,6 +8,10 @@ on: schedule: - cron: "0 3 * * 1" +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + jobs: analyze: name: Analyze (Java/Kotlin) From 060cb32b30387005a1d168cc0e748d094beee34b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Tue, 21 Apr 2026 20:51:04 +0900 Subject: [PATCH 14/17] =?UTF-8?q?ci:=20E2E=20Verify=20XML=20=EC=97=90?= =?UTF-8?q?=EC=84=9C=20xmllint=20=E2=86=92=20python3=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ubuntu-24.04 runner 는 libxml2-utils 를 기본 포함하지 않아 xmllint 가 command not found 로 실패. python3 는 preinstalled 이고 xml.etree 로 동일한 well-formedness 검증 가능해 apt 설치 없이 한 줄로 대체. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 586d3ba..bb184dd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -149,7 +149,7 @@ jobs: run: | test -f values/strings_generated.xml test -s values/strings_generated.xml - xmllint --noout values/strings_generated.xml + python3 -c "import xml.etree.ElementTree as ET; ET.parse('values/strings_generated.xml')" variants=$(ls -d values-* 2>/dev/null | wc -l | tr -d ' ') echo "locale variants found: $variants" test "$variants" -ge 1 From 2fec40b57e281db2181bb315760b8f2959d228bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Wed, 22 Apr 2026 09:42:00 +0900 Subject: [PATCH 15/17] =?UTF-8?q?chore:=20version=201.2.0.15=20=E2=86=92?= =?UTF-8?q?=201.2.0=20(3=EC=9E=90=EB=A6=AC=20semver=20=EC=A0=95=EB=A0=AC)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 루트 프로젝트는 v1.1.0 부터 README/jitpack 태그가 3자리 semver 로 운용되어 왔는데 build.gradle.kts 만 4자리 잔재 (.15) 를 유지하고 있어 일관성이 깨져 있었음. 빌드 카운터 컴포넌트 제거하고 정렬. Co-Authored-By: Claude Opus 4.7 (1M context) --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 709405a..06a6a7a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } group = "com.rsupport" -version = "1.2.0.15" +version = "1.2.0" repositories { mavenCentral() From dc63518003444169a0bf9b653b58bf5d694ffd81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Wed, 22 Apr 2026 13:22:06 +0900 Subject: [PATCH 16/17] =?UTF-8?q?docs:=20README/=EA=B0=80=EC=9D=B4?= =?UTF-8?q?=EB=93=9C=20=EC=98=81=EC=96=B4=ED=99=94=20+=201.2.0=20/=20JDK?= =?UTF-8?q?=2021=20=EB=B0=98=EC=98=81,=20LICENSE=202024=20=E2=86=92=202026?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - README.md: 전체 영어 번역 - Requirements 섹션 신설 (JDK 21+, Gradle 8.10+, AGP 8.0+) - Version catalog / classpath 레퍼런스 1.1.0 → 1.2.0 - Kotlin DSL 예제의 Property accessor .value(x) → .set(x) — .value(T) 는 새 Property 를 반환하는 빌더라 기존 Property 값을 설정하지 않음. 현재 extension(StringTableExtension) 의 setter/.set() 와 정합시켜 실사용 코드 기준으로 교정. - Setting.gradle.kts 오타 → settings.gradle.kts - defaultLanguageForValues 동작 설명 보강 (values/ 치환 의미) - guide-google-credential.md: OAuth 발급 10단계 영어 번역 - tool/readme.md: merge.py 설명 영어 번역 - LICENSE 연도 2024 → 2026 Co-Authored-By: Claude Opus 4.7 (1M context) --- README.md | 159 +++++++++++++++++++------------------ guide-google-credential.md | 22 ++--- tool/readme.md | 10 +-- 3 files changed, 98 insertions(+), 93 deletions(-) diff --git a/README.md b/README.md index 5c23275..4ddc927 100644 --- a/README.md +++ b/README.md @@ -1,30 +1,36 @@ [![](https://jitpack.io/v/rsupportrnd/android-string-table.svg)](https://jitpack.io/#rsupportrnd/android-string-table) # android-string-table -## 💡 소개 +## 💡 Overview *** -구글 스프레드 시트에 작성한 내용을 안드로이드 스튜디오에서 사용 가능한 문자열 리소스 파일(.xml)로 변환한다. +Converts a Google Spreadsheet into Android string resource files (`strings_generated.xml`) that Android Studio can consume directly. -## 💡 Package별 기능 상세 +## 💡 Requirements *** -### com.rsupport.download -구글 시트를 엑설 파일(.xlsx)로 다운로드 한다. +- **JDK 21 or higher** — Android Studio Ladybug (2024.2.1) and newer ship JDK 21 by default. Older IDEs must be upgraded or pointed at a JDK 21 runtime. +- **Gradle 8.10+** (wrapper) +- **Android Gradle Plugin 8.0+** -### com.rsupport.google -구글 api 관련 패키지 +## 💡 Package structure +*** +### `com.rsupport.download` +Downloads a Google Sheet as an Excel file (`.xlsx`). + +### `com.rsupport.google` +Google API wrappers (Drive / Sheets / OAuth). -### com.ruspport.stringtable -다운로드 한 엑셀 파일을 이용하여 문자열 리소스 파일을 생성한다. +### `com.rsupport.stringtable` +Generates string resource files from the downloaded Excel file. -### com.rsupport.plugin -플러그인 관련 패키지 +### `com.rsupport.plugin` +Gradle plugin wiring — exposes the `androidStringTable { ... }` extension and registers the tasks below. -## 💡플러그인 적용 방법 +## 💡 Applying the plugin *** -### Kotlin DSL (Version catalog) +### Kotlin DSL (with Version catalog) -### Build.gradle.kts(:project) -````kotlin +#### `build.gradle.kts` (project) +```kotlin buildscript { repositories { maven("https://jitpack.io") @@ -33,42 +39,42 @@ buildscript { classpath(libs.rsupportrnd.android.string.table) } } -```` +``` -### libs.versions.toml -````toml +#### `libs.versions.toml` +```toml [versions] -androidStringTable = "1.1.0" +androidStringTable = "1.2.0" [libraries] rsupportrnd-android-string-table = { group = "com.github.rsupportrnd", name = "android-string-table", version.ref = "androidStringTable" } [plugins] android-string-table = { id = "android-string-table" } -```` +``` -### Build.gradle.kts(:app) -````kotlin +#### `build.gradle.kts` (app) +```kotlin plugins { alias(libs.plugins.android.string.table) } androidStringTable { - googleDriveCredentialPath.value("${project.rootDir}/strings/credentials.json") - targetSheetUrl.value("https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0") // full url of sheet included tab gid - outputXlsxFilePath.value("${project.rootDir}/strings/archive.xlsx") - androidResourcePath.value("$projectDir/src/main/res") - - // 아래부터 생략 가능 - rowPositionColumnHeader.value(1) - defaultLanguageForValues.value("en") // values 로 지정됨 - doNotConvertNewLine.value(false) - outputXmlFileName.value("strings_generated") + googleDriveCredentialPath.set("${project.rootDir}/strings/credentials.json") + targetSheetUrl.set("https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0") // full sheet URL including the tab gid + outputXlsxFilePath.set("${project.rootDir}/strings/archive.xlsx") + androidResourcePath.set("$projectDir/src/main/res") + + // optional below + rowPositionColumnHeader.set(1) + defaultLanguageForValues.set("en") // this language's column is written to `values/` instead of `values-en/` + doNotConvertNewLine.set(false) + outputXmlFileName.set("strings_generated") } -```` +``` -### Setting.gradle.kts(:Project Settings) -````kotlin +#### `settings.gradle.kts` (project settings) +```kotlin dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { @@ -77,79 +83,79 @@ dependencyResolutionManagement { maven("https://jitpack.io") } } -```` +``` *** ### Groovy DSL -### Build.gradle(:project) -````groovy -buildscript { - repositories { - google() - jcenter() - maven { url 'https://jitpack.io' } - } - dependencies { - classpath 'com.github.rsupportrnd:android-string-table:1.1.0' - } +#### `build.gradle` (project) +```groovy +buildscript { + repositories { + google() + mavenCentral() + maven { url 'https://jitpack.io' } } -```` -### Build.gradle(:app) -````groovy + dependencies { + classpath 'com.github.rsupportrnd:android-string-table:1.2.0' + } +} +``` +#### `build.gradle` (app) +```groovy apply plugin: 'android-string-table' - -androidStringTable { + +androidStringTable { googleDriveCredentialPath "${project.rootDir}/strings/credentials.json" - targetSheetUrl 'https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0' // full url of sheet included tab gid + targetSheetUrl 'https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0' // full sheet URL including the tab gid outputXlsxFilePath "${project.rootDir}/strings/archive.xlsx" androidResourcePath "src/main/res" - - // 아래부터 생략 가능 + + // optional below rowPositionColumnHeader 1 - defaultLanguageForValues "en" // values 로 지정됨 + defaultLanguageForValues "en" // this language's column is written to `values/` instead of `values-en/` doNotConvertNewLine false outputXmlFileName "strings_generated.xml" } -```` +``` + +## 💡 Getting the Google credential file +[Guide to obtaining a Google credential](guide-google-credential.md) -## 💡 Credential 파일 다운로드 방법 -[Guide to get google credential](guide-google-credential.md) - -## 💡 플러그인 적용시 생성되는 task +## 💡 Tasks registered by the plugin *** ![screenshot10](screenshots/screenshot_10.png) - **updateResource** - - 스프레드 시트를 다운로드하고 문자열 리소스 파일(.xml)을 생성한다. + + Downloads the spreadsheet and generates string resource files (`.xml`). - **downloadSpreadsheet** - 스프레드 시트를 다운로드 한다. + Downloads the spreadsheet only. - **generateStringsXmls** - 문자열 리소스 파일(.xml)을 생성한다. + Generates string resource files from the already-downloaded spreadsheet. -## 💡 플러그인 적용 가능한 스프레드 시트 작성 방법 +## 💡 Spreadsheet authoring rules *** -➰예제 스프레드 시트 : https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0 +➰ Example spreadsheet: https://docs.google.com/spreadsheets/d/1W6WG_b40FmvyVbstodPgwA6USc0PRANoemCMN66_peM/edit#gid=0 ![screenshot11](screenshots/screenshot_11.png) -1. 인덱스 행을 표시하기 위해 "id" 혹은 "identification"을 포함한 문자열을 입력한다. -2. 인덱스 행의 셀 내부 문자열에 "values"를 포함하지 않거나 언어코드가 아닌 열은 파싱되지 않고 넘어간다. -3. 안드로이드 스튜디오에서 국가와 언어 별로 string.xml 파일이 담긴 values 폴더를 명명하는 법칙과 동일하게 "values-국가, 언어 코드"로 해당 열의 국가와 언어를 표기한다. -4. 국가와 언어 코드가 표기되지 않은 단순 "values" 열은 기본 문자열 파일로 변환된다. (default 코드를 지정하면 values 로 치환된다.) +1. To mark the index (header) row, enter a string that contains `id` or `identification` in the first column. +2. In the index row, any column whose header does not contain `values` and is not a valid language code is skipped. +3. Name each locale column with the same qualifier convention Android uses for `values-*` folders (`values-`, e.g. `values-ko`, `values-ja`). +4. A plain `values` column (no language suffix) becomes the default strings file. If `defaultLanguageForValues` is set, the matching column is written to `values/` instead of `values-/`. -## 💡 스프레드 시트 URL +## 💡 Spreadsheet URL *** -공유 기능으로 링크 복사를 하는 것이 아니고 주소창에 있는 주소를 직접 복사해서 붙여넣는다. +Copy the URL directly from the browser address bar — do **not** use the Share → Copy Link option, which produces a different URL shape the plugin cannot parse. The MIT License (MIT) ===================== -Copyright © 2024 RSUPPORT +Copyright © 2026 RSUPPORT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -files (the “Software”), to deal in the Software without +files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the @@ -159,7 +165,7 @@ conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT @@ -167,4 +173,3 @@ HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - diff --git a/guide-google-credential.md b/guide-google-credential.md index 03ee984..76fd001 100644 --- a/guide-google-credential.md +++ b/guide-google-credential.md @@ -1,40 +1,40 @@ -## 💡 Credential 파일 다운로드 방법 +## 💡 How to obtain the Google credential file *** -**1. 구글 클라우드 콘솔(https://console.cloud.google.com/) 접속 후 로그인** +**1. Open the Google Cloud Console (https://console.cloud.google.com/) and sign in.** -**2. 프로젝트 생성 혹은 프로젝트 선택** +**2. Create a new project or select an existing one.** -**3. "API 및 서비스" 메뉴에서 "라이브러리" 선택** +**3. In the "APIs & Services" menu, open "Library".** ![screenshot1](screenshots/screenshot_1.png) -**4. Google Sheet API, Google Drive API 검색하여 사용 설정** +**4. Search for and enable both the Google Sheets API and the Google Drive API.** ![screenshot2](screenshots/screenshot_2.png) ![screenshot3](screenshots/screenshot_3.png) -**5. "사용자 인증 정보"에서 "사용자 인증 정보 만들기" 클릭 후 "OAuth 클라이언트 ID" 선택** +**5. Under "Credentials", click "Create Credentials" and choose "OAuth client ID".** ![screenshot4](screenshots/screenshot_4.png) -**6. "동의화면 구성" 버튼 클릭** +**6. Click the "Configure consent screen" button.** ![screenshot5](screenshots/screenshot_5.png) -**7. 프로젝트의 목적에 맞게 동의화면 구성** +**7. Configure the consent screen to match your project.** ![screenshot6](screenshots/screenshot_6.png) -**8. "OAuth 클라이언트 ID" 생성 다시 시작** +**8. Return to creating the OAuth client ID.** ![screenshot7](screenshots/screenshot_7.png) -**9. 어플리케이션 유형을 "데스크톱 앱"으로 설정. 이름을 설정 후 "만들기" 버튼 클릭** +**9. Set Application type to "Desktop app", give it a name, then click "Create".** ![screenshot8](screenshots/screenshot_8.png) -**10. OAuth 2.0 클라이언트 ID 목록에서 다운로드 버튼을 클릭하면 client_secret_XXX.json 파일이 다운로드 되는데, 이 json 파일이 credential 파일이다.** +**10. From the OAuth 2.0 Client IDs list, click the download button; a `client_secret_XXX.json` file is downloaded. That JSON file is your credential.** ![screenshot9](screenshots/screenshot_9.png) diff --git a/tool/readme.md b/tool/readme.md index 562341d..6bcfd23 100644 --- a/tool/readme.md +++ b/tool/readme.md @@ -2,18 +2,18 @@ ## merge.py -선택된 폴더에서 선택된 동일 이름 xml파일들을 하나로 합칩니다. +Merges same-named XML files found under the given folder into a single output file. -### res 폴더 내 모든 strings.xml을 합치는 경우 +### Merge every `strings.xml` under a `res/` directory `python merge.py input [res path]` or `python merge.py input [res path] target "strings.xml" output "merged_strings.xlsx"` -### res 폴더 내 모든 strings.xml strings_generated.xml을 합치는 경우 +### Merge every `strings.xml` and `strings_generated.xml` under a `res/` directory -#### 중복 id 시, strings_generated.xml을 우선 +#### On duplicate ids, prefer `strings_generated.xml` `python merge.py input [res path] target "strings.xml" target "strings_generated.xml" output "merged_strings.xlsx"` -#### 중복 id 시 strings.xml을 우선 +#### On duplicate ids, prefer `strings.xml` `python merge.py input [res path] target "strings_generated.xml" target "strings.xml" output "merged_strings.xlsx"` From c88ab4341715b1082455af4bc25decc9f8d6efd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=EC=84=B1=EC=8B=9D?= Date: Wed, 22 Apr 2026 13:30:11 +0900 Subject: [PATCH 17/17] =?UTF-8?q?fix:=20Android=20=EB=A6=AC=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20qualifier=20=EC=A0=95=EA=B7=9C=ED=99=94=20(zh-CN=20?= =?UTF-8?q?=E2=86=92=20zh-rCN)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit xlsx 컬럼 헤더에 "zh-CN" 같은 BCP 47 스타일 region 표기가 들어오면 플러그인이 그대로 "values-zh-CN/" 디렉터리를 만들어 왔다. Android 리소스 머저는 이를 "Invalid resource directory name" 으로 거부하므로 updateResource 직후 assembleDebug 가 깨진다. LanguageCode.toAndroidQualifier 를 도입해 region 세그먼트에 -r 을 삽입 (zh-CN → zh-rCN). Sheet2Strings.createResourceFolderName 의 양쪽 분기(columnHeader 가 "values-" 로 시작하는 경우 / 언어코드 그대로인 경우) 모두 이 유틸을 경유하도록 교정. 이미 "-rXX" 포맷이거나 region 없는 언어 단일 코드는 그대로 패스스루. BCP 47 script 포함 3-segment 코드는 현 스코프 밖이라 그대로 둔다. 회귀 방지로 LanguageCodeTest 에 toAndroidQualifier 케이스 8개 추가. Co-Authored-By: Claude Opus 4.7 (1M context) --- .../com/rsupport/stringtable/LanguageCode.kt | 12 +++++++++++ .../com/rsupport/stringtable/Sheet2Strings.kt | 9 ++++----- src/test/java/LanguageCodeTest.kt | 20 +++++++++++++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/rsupport/stringtable/LanguageCode.kt b/src/main/java/com/rsupport/stringtable/LanguageCode.kt index d447ae6..553fd5c 100644 --- a/src/main/java/com/rsupport/stringtable/LanguageCode.kt +++ b/src/main/java/com/rsupport/stringtable/LanguageCode.kt @@ -21,6 +21,18 @@ class LanguageCode { val code = languageCode.removePrefix("values-") return code.ifBlank { null } } + + // Android resource qualifier expects "-r" for the region segment; a plain hyphen + // ("zh-CN") is rejected by the resource merger at assembleDebug time. Normalize common + // BCP 47-style codes to the Android form; pass through already-qualified codes and + // language-only codes unchanged. + fun toAndroidQualifier(code: String): String { + val parts = code.split("-") + if (parts.size < 2) return code + if (parts.size == 2 && parts[1].length == 3 && parts[1].startsWith("r")) return code + if (parts.size == 2 && parts[1].length == 2) return "${parts[0]}-r${parts[1]}" + return code + } } diff --git a/src/main/java/com/rsupport/stringtable/Sheet2Strings.kt b/src/main/java/com/rsupport/stringtable/Sheet2Strings.kt index f6651bb..956ccd1 100644 --- a/src/main/java/com/rsupport/stringtable/Sheet2Strings.kt +++ b/src/main/java/com/rsupport/stringtable/Sheet2Strings.kt @@ -78,17 +78,16 @@ object Sheet2Strings { defaultLanguage: String, ): String? { if (columnHeader.startsWith("values")) { - if (defaultLanguage == LanguageCode.getActualCode(columnHeader)) { - return "values" - } - return columnHeader + val code = LanguageCode.getActualCode(columnHeader) ?: return "values" + if (defaultLanguage == code) return "values" + return "values-${LanguageCode.toAndroidQualifier(code)}" } if (LanguageCode.isValid(columnHeader)) { if (defaultLanguage == columnHeader) { return "values" } - return "values-$columnHeader" + return "values-${LanguageCode.toAndroidQualifier(columnHeader)}" } return null diff --git a/src/test/java/LanguageCodeTest.kt b/src/test/java/LanguageCodeTest.kt index 7a36ebd..d9cd3de 100644 --- a/src/test/java/LanguageCodeTest.kt +++ b/src/test/java/LanguageCodeTest.kt @@ -2,6 +2,7 @@ import com.rsupport.stringtable.LanguageCode import org.junit.Test import org.junit.Assert.assertTrue import org.junit.Assert.assertFalse +import org.junit.Assert.assertEquals import java.util.* class LanguageCodeTest { @@ -49,4 +50,23 @@ class LanguageCodeTest { ) } } + + @Test + fun testToAndroidQualifier() { + val cases = mapOf( + "zh-CN" to "zh-rCN", + "zh-TW" to "zh-rTW", + "en-US" to "en-rUS", + "ko-KR" to "ko-rKR", + // already in Android form — pass through + "zh-rCN" to "zh-rCN", + "zh-rTW" to "zh-rTW", + // language only — no change + "ko" to "ko", + "en" to "en", + ) + for ((input, expected) in cases) { + assertEquals("toAndroidQualifier($input)", expected, LanguageCode.toAndroidQualifier(input)) + } + } } \ No newline at end of file