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
1 change: 0 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import com.github.triplet.gradle.androidpublisher.ResolutionStrategy

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.play.publisher)
}
Expand Down
24 changes: 7 additions & 17 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import com.android.build.api.dsl.CommonExtension
import com.android.build.api.dsl.LibraryExtension
import io.gitlab.arturbosch.detekt.Detekt
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidProjectExtension
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.kotlin.compose) apply false
alias(libs.plugins.kotlin.serialization) apply false

Expand Down Expand Up @@ -44,21 +42,21 @@ allprojects {
}
}

fun CommonExtension<*, *, *, *, *, *>.configureAndroidCommon() {
fun CommonExtension.configureAndroidCommon() {
compileSdk = libs.versions.compileSdk.get().toInt()
defaultConfig {
defaultConfig.apply {
minSdk = libs.versions.minSdk.get().toInt()
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
compileOptions {
compileOptions.apply {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
buildFeatures {
buildFeatures.apply {
compose = true
}
testOptions {
unitTests {
testOptions.apply {
unitTests.apply {
isIncludeAndroidResources = true
isReturnDefaultValues = true
}
Expand All @@ -75,7 +73,7 @@ subprojects {
plugins.withId("com.android.library") {
extensions.configure<LibraryExtension>("android") {
configureAndroidCommon()
defaultConfig {
testOptions {
targetSdk = libs.versions.targetSdk.get().toInt()
}
buildTypes {
Expand All @@ -92,14 +90,6 @@ subprojects {
}
}

plugins.withId("org.jetbrains.kotlin.android") {
extensions.configure<KotlinAndroidProjectExtension>("kotlin") {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
}
}
}

plugins.withId("org.jetbrains.kotlin.jvm") {
extensions.configure<KotlinJvmProjectExtension>("kotlin") {
compilerOptions {
Expand Down
5 changes: 0 additions & 5 deletions curiosity/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)

`maven-publish`
Expand All @@ -9,10 +8,6 @@ plugins {

android {
namespace = "io.github.hellocuriosity.compose"

defaultConfig {
consumerProguardFiles("consumer-rules.pro")
}
}

dependencies {
Expand Down
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[versions]
# Plugins
agp = "8.13.2"
agp = "9.2.0"
kotlin = "2.3.21"
detekt = "1.23.8"
kotlinter = "5.4.2"
kover = "0.9.8"
playPublisher = "3.13.0"
playPublisher = "4.0.0"

# AndroidX
coreKtx = "1.18.0"
Expand Down
1 change: 0 additions & 1 deletion navigation/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)

`maven-publish`
Expand Down
5 changes: 0 additions & 5 deletions settings/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)

`maven-publish`
Expand All @@ -9,10 +8,6 @@ plugins {

android {
namespace = "io.github.hellocuriosity.compose.settings"

defaultConfig {
consumerProguardFiles("consumer-rules.pro")
}
}

dependencies {
Expand Down
1 change: 0 additions & 1 deletion test-compose-utils/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
alias(libs.plugins.android.library)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)

`maven-publish`
Expand Down