Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply Kotlin 2.0.21 #363

Merged
merged 2 commits into from
Oct 20, 2024
Merged

Apply Kotlin 2.0.21 #363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d511a
빌드시 테스트 태스크 제외시키고 CI에서만 돌리기
l2hyunwoo Oct 20, 2024
343cc4b
Apply Kotlin 2.0.21
l2hyunwoo Oct 20, 2024
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/android-develop.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ jobs:
mkdir ./app/src/debug
echo '${{ secrets.GOOGLE_SERVICES_JSON_DEBUG }}' > ./app/src/debug/google-services.json

- name: Create local.properteis
- name: Create local.properties
run: echo '${{ secrets.LOCAL_PROPERTIES }}' > ./local.properties

# Build Debug App
- name: Build with Gradle
run: ./gradlew :app:assembleDebug
run: ./gradlew :app:assembleDebug -PisCI=true

# Run unit test
- name: Run unit test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ jobs:

# Build APK Release
- name: Build release Apk
run: ./gradlew :app:assembleRelease
run: ./gradlew :app:assembleRelease -PisCI=true

# Build AAB Release
- name: Build release Bundle
run: ./gradlew :app:bundleRelease
run: ./gradlew :app:bundleRelease -PisCI=true

# Upload AAB
- name: Upload a Build AAB Artifact
Expand Down
9 changes: 8 additions & 1 deletion build-logic/src/main/kotlin/com/ku_stacks/ku_ring/buildlogic/convention/FeaturePlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.ku_stacks.ku_ring.buildlogic.convention

import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.LibraryExtension
import com.android.build.gradle.tasks.factory.AndroidUnitTest
import com.ku_stacks.ku_ring.buildlogic.dsl.configureAndroidLibrary
import com.ku_stacks.ku_ring.buildlogic.primitive.CommonAndroidPlugin
import com.ku_stacks.ku_ring.buildlogic.primitive.HiltPlugin
import com.ku_stacks.ku_ring.buildlogic.primitive.KotlinPlugin
import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.tasks.testing.Test
import org.gradle.kotlin.dsl.apply
import org.gradle.kotlin.dsl.configure

Expand All @@ -32,6 +33,12 @@ class FeaturePlugin: Plugin<Project> {
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
}
}
tasks.withType(Test::class.java).configureEach {
enabled = project.hasProperty("isCI") && project.property("isCI") == "true"
}
tasks.withType(AndroidUnitTest::class.java).configureEach {
enabled = project.hasProperty("isCI") && project.property("isCI") == "true"
}
}
}
}
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[versions]
# project-level dependency
android-gradle = "8.7.1"
kotlin = '2.0.10'
ksp = '2.0.10-1.0.24'
kotlin = '2.0.21'
ksp = '2.0.21-1.0.25'
hilt = '2.52'
google-services = '4.4.2'
firebase-gradle = '3.0.2'
Expand Down