From ba7df609e92f5a465a1cca5b378169f372b22d1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=98=81=EB=AF=BC?= Date: Sun, 6 Jul 2025 15:10:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=B2=84=EC=A0=84,=20=EA=B8=B0?= =?UTF-8?q?=ED=83=80=20=EB=93=B1=EB=93=B1=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 12 ++++++------ build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- widget/build.gradle.kts | 2 +- .../com/no5ing/bbibbi/widget/WidgetImageWorker.kt | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 59cc8ca6..5e9432d5 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -12,12 +12,12 @@ plugins { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } kotlin { - jvmToolchain(17) + jvmToolchain(21) } secrets { @@ -31,7 +31,7 @@ val secretProperties = Properties().apply { android { namespace = "com.no5ing.bbibbi" - compileSdk = 34 + compileSdk = 35 signingConfigs { create("release") { @@ -45,7 +45,7 @@ android { defaultConfig { applicationId = "com.no5ing.bbibbi" minSdk = 26 - targetSdk = 34 + targetSdk = 35 versionCode = 11015 versionName = "1.3.1" @@ -85,7 +85,7 @@ android { buildConfig = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.6" + kotlinCompilerExtensionVersion = "1.5.10" } packaging { resources { diff --git a/build.gradle.kts b/build.gradle.kts index 8e2816be..544416a5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id("com.android.application") version "8.2.1" apply false - id("org.jetbrains.kotlin.android") version "1.8.20" apply false + id("com.android.application") version "8.10.1" apply false + id("org.jetbrains.kotlin.android") version "1.9.22" apply false id("com.google.gms.google-services") version "4.4.0" apply false id("com.google.firebase.crashlytics") version "2.9.9" apply false - id("com.android.test") version "8.2.1" apply false - id("com.android.library") version "8.2.1" apply false + id("com.android.test") version "8.10.1" apply false + id("com.android.library") version "8.10.1" apply false } buildscript { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bd29eaa6..9c97af2d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Dec 16 20:36:39 KST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/widget/build.gradle.kts b/widget/build.gradle.kts index ab34e719..966b2105 100644 --- a/widget/build.gradle.kts +++ b/widget/build.gradle.kts @@ -48,7 +48,7 @@ android { buildConfig = true } composeOptions { - kotlinCompilerExtensionVersion = "1.4.6" + kotlinCompilerExtensionVersion = "1.5.10" } compileOptions { sourceCompatibility = JavaVersion.VERSION_17 diff --git a/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt index f9466944..01b4a1cc 100644 --- a/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt +++ b/widget/src/main/java/com/no5ing/bbibbi/widget/WidgetImageWorker.kt @@ -156,7 +156,7 @@ class WidgetImageWorker( private fun fetchDetails(): Response { val client = createOkHttpClient() val widgetRequest = Request.Builder() - .url(BuildConfig.apiBaseUrl + "v1/widgets/single-recent-family-post") + .url(BuildConfig.apiBaseUrl + "/v1/widgets/single-recent-family-post") .get() .build() val response = client.newCall(widgetRequest).execute() From 6301b87268544a9079b62a6979f8ec577209da7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=86=A1=EC=98=81=EB=AF=BC?= Date: Sun, 6 Jul 2025 15:12:23 +0900 Subject: [PATCH 2/2] feat: update ci jdk --- .github/workflows/dev.yml | 4 ++-- .github/workflows/prod.yml | 4 ++-- .github/workflows/stage.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 28cf0e25..ab96f944 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -23,10 +23,10 @@ jobs: ruby-version: 2.6.10 bundler-cache: true - - name: JDK17 준비하기 + - name: JDK21 준비하기 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Gradle 애드온 준비하기 diff --git a/.github/workflows/prod.yml b/.github/workflows/prod.yml index b50ea0f5..68152f09 100644 --- a/.github/workflows/prod.yml +++ b/.github/workflows/prod.yml @@ -18,10 +18,10 @@ jobs: ruby-version: 2.6.10 bundler-cache: true - - name: JDK17 준비하기 + - name: JDK21 준비하기 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Gradle 애드온 준비하기 diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index 6dba8b81..8eb4f3d2 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -23,10 +23,10 @@ jobs: ruby-version: 2.6.10 bundler-cache: true - - name: JDK17 준비하기 + - name: JDK21 준비하기 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '21' distribution: 'temurin' - name: Gradle 애드온 준비하기