Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 애드온 준비하기
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 애드온 준비하기
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 애드온 준비하기
Expand Down
12 changes: 6 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -31,7 +31,7 @@ val secretProperties = Properties().apply {

android {
namespace = "com.no5ing.bbibbi"
compileSdk = 34
compileSdk = 35

signingConfigs {
create("release") {
Expand All @@ -45,7 +45,7 @@ android {
defaultConfig {
applicationId = "com.no5ing.bbibbi"
minSdk = 26
targetSdk = 34
targetSdk = 35
versionCode = 11015
versionName = "1.3.1"

Expand Down Expand Up @@ -85,7 +85,7 @@ android {
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.6"
kotlinCompilerExtensionVersion = "1.5.10"
}
packaging {
resources {
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion widget/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ android {
buildConfig = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.4.6"
kotlinCompilerExtensionVersion = "1.5.10"
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Loading