Skip to content

Migrate to the new KMP AGP plugin #60

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

Open
yasanglass wants to merge 1 commit into
base: main
Choose a base branch
from
+118 −131
Open

Migrate to the new KMP AGP plugin #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 9 additions & 21 deletions kotlin-multiplatform/about/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val artifactId = "about"

plugins {
alias(libs.plugins.jetbrains.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.android.kotlin.multiplatform.library)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.jetbrains.kotlin.compose)
alias(libs.plugins.jetbrains.compose.hotreload)
Expand All @@ -20,13 +20,18 @@ kotlin {
freeCompilerArgs.add("-Xcontext-sensitive-resolution")
}

androidTarget {
publishLibraryVariants("release")
@OptIn(ExperimentalKotlinGradlePluginApi::class)
androidLibrary {
namespace = "glass.yasan.toolkit.compose.about"
compileSdk = libs.versions.android.sdk.compile.get().toInt()
minSdk = libs.versions.android.sdk.min.get().toInt()

androidResources.enable = true

compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

jvm()
iosX64()
iosArm64()
Expand Down Expand Up @@ -72,23 +77,6 @@ kotlin {
}
}

android {
namespace = "glass.yasan.toolkit.compose.about"
compileSdk = libs.versions.android.sdk.compile.get().toInt()

defaultConfig {
minSdk = libs.versions.android.sdk.min.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

dependencies {
debugImplementation(compose.uiTooling)
}

compose.resources {
publicResClass = false
Expand Down
2 changes: 1 addition & 1 deletion kotlin-multiplatform/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
alias(libs.plugins.jetbrains.kotlin.compose) apply false
alias(libs.plugins.jetbrains.kotlin.multiplatform) apply false
alias(libs.plugins.android.application) apply false
alias(libs.plugins.android.library) apply false
alias(libs.plugins.android.kotlin.multiplatform.library) apply false
alias(libs.plugins.jetbrains.compose) apply false
alias(libs.plugins.jetbrains.compose.hotreload) apply false
alias(libs.plugins.vanniktech.maven.publish) apply false
Expand Down
27 changes: 9 additions & 18 deletions kotlin-multiplatform/compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val artifactId = "compose"

plugins {
alias(libs.plugins.jetbrains.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.android.kotlin.multiplatform.library)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.jetbrains.kotlin.compose)
alias(libs.plugins.jetbrains.compose.hotreload)
Expand All @@ -21,13 +21,18 @@ kotlin {
freeCompilerArgs.add("-Xcontext-sensitive-resolution")
}

androidTarget {
publishLibraryVariants("release")
@OptIn(ExperimentalKotlinGradlePluginApi::class)
androidLibrary {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()
minSdk = libs.versions.android.sdk.min.get().toInt()

androidResources.enable = true

compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

jvm()
iosX64()
iosArm64()
Expand Down Expand Up @@ -86,20 +91,6 @@ kotlin {
}
}

android {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()

defaultConfig {
minSdk = libs.versions.android.sdk.min.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

compose.resources {
publicResClass = false
packageOfResClass = "glass.yasan.toolkit.$artifactId"
Expand Down
25 changes: 7 additions & 18 deletions kotlin-multiplatform/core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val artifactId = "core"

plugins {
alias(libs.plugins.jetbrains.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.android.kotlin.multiplatform.library)
}

kotlin {
Expand All @@ -18,13 +18,16 @@ kotlin {
freeCompilerArgs.add("-Xcontext-sensitive-resolution")
}

androidTarget {
publishLibraryVariants("release")
@OptIn(ExperimentalKotlinGradlePluginApi::class)
androidLibrary {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()
minSdk = libs.versions.android.sdk.min.get().toInt()

compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

jvm()
iosX64()
iosArm64()
Expand Down Expand Up @@ -67,20 +70,6 @@ kotlin {
}
}

android {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()

defaultConfig {
minSdk = libs.versions.android.sdk.min.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

configure<com.vanniktech.maven.publish.MavenPublishBaseExtension> {
coordinates(artifactId = artifactId)
}
2 changes: 1 addition & 1 deletion kotlin-multiplatform/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ touchlab-kermit = { module = "co.touchlab:kermit", version.ref = "touchlab-kermi

[plugins]
android-application = { id = "com.android.application", version.ref = "agp" }
android-library = { id = "com.android.library", version.ref = "agp" }
android-kotlin-multiplatform-library = { id = "com.android.kotlin.multiplatform.library", version.ref = "agp" }
arturbosch-detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "arturbosch-detekt" }
jetbrains-compose-hotreload = { id = "org.jetbrains.compose.hot-reload", version.ref = "jetbrains-compose-hotreload" }
iurysouza-modulegraph = { id = "dev.iurysouza.modulegraph", version.ref = "iurysouza-modulegraph" }
Expand Down
25 changes: 7 additions & 18 deletions kotlin-multiplatform/koin/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ val artifactId = "koin"

plugins {
alias(libs.plugins.jetbrains.kotlin.multiplatform)
alias(libs.plugins.android.library)
alias(libs.plugins.android.kotlin.multiplatform.library)
}

kotlin {
Expand All @@ -18,13 +18,16 @@ kotlin {
freeCompilerArgs.add("-Xcontext-sensitive-resolution")
}

androidTarget {
publishLibraryVariants("release")
@OptIn(ExperimentalKotlinGradlePluginApi::class)
androidLibrary {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()
minSdk = libs.versions.android.sdk.min.get().toInt()

compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

jvm()
iosX64()
iosArm64()
Expand Down Expand Up @@ -79,20 +82,6 @@ kotlin {
}
}

android {
namespace = "glass.yasan.toolkit.$artifactId"
compileSdk = libs.versions.android.sdk.compile.get().toInt()

defaultConfig {
minSdk = libs.versions.android.sdk.min.get().toInt()
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

configure<com.vanniktech.maven.publish.MavenPublishBaseExtension> {
coordinates(artifactId = artifactId)
}
55 changes: 55 additions & 0 deletions kotlin-multiplatform/sample/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.jetbrains.kotlin.android)
alias(libs.plugins.jetbrains.kotlin.compose)
}

android {
namespace = "glass.yasan.toolkit.sample.android"
compileSdk = libs.versions.sample.android.sdk.compile.get().toInt()

defaultConfig {
applicationId = "glass.yasan.toolkit.sample"
minSdk = libs.versions.sample.android.sdk.min.get().toInt()
targetSdk = libs.versions.sample.android.sdk.target.get().toInt()
versionCode = 1
versionName = "1.0.0"
}

packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}

buildTypes {
release {
isMinifyEnabled = false
}
}

compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}

kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

buildFeatures {
compose = true
}
}

dependencies {
implementation(project(":sample:composeApp"))

implementation(libs.androidx.activity.compose)
implementation(libs.koin.android)
debugImplementation(libs.androidx.compose.ui.tooling)
}
0 ...src/androidMain/ic_launcher-playstore.png → ...mple/androidApp/ic_launcher-playstore.png
View file
Open in desktop
File renamed without changes
0 ...seApp/src/androidMain/AndroidManifest.xml → ...e/androidApp/src/main/AndroidManifest.xml
View file
Open in desktop
File renamed without changes.
3 changes: 2 additions & 1 deletion ...lass/yasan/toolkit/sample/MainActivity.kt → ...an/toolkit/sample/android/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package glass.yasan.toolkit.sample
package glass.yasan.toolkit.sample.android

import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.activity.enableEdgeToEdge
import glass.yasan.toolkit.sample.SampleApp

class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
Expand Down
3 changes: 1 addition & 2 deletions ...yasan/toolkit/sample/SampleApplication.kt → ...olkit/sample/android/SampleApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package glass.yasan.toolkit.sample
package glass.yasan.toolkit.sample.android

import android.app.Application
import glass.yasan.toolkit.sample.di.sampleModule
Expand All @@ -17,4 +17,3 @@ class SampleApplication : Application() {
}
}
}

0 ...ain/res/mipmap-anydpi-v26/ic_launcher.xml → ...ain/res/mipmap-anydpi-v26/ic_launcher.xml
View file
Open in desktop
File renamed without changes.
0 ...s/mipmap-anydpi-v26/ic_launcher_round.xml → ...s/mipmap-anydpi-v26/ic_launcher_round.xml
View file
Open in desktop
File renamed without changes.
0 ...roidMain/res/mipmap-hdpi/ic_launcher.webp → ...src/main/res/mipmap-hdpi/ic_launcher.webp
View file
Open in desktop
File renamed without changes
0 ...s/mipmap-hdpi/ic_launcher_foreground.webp → ...s/mipmap-hdpi/ic_launcher_foreground.webp
View file
Open in desktop
File renamed without changes
0 ...in/res/mipmap-hdpi/ic_launcher_round.webp → ...in/res/mipmap-hdpi/ic_launcher_round.webp
View file
Open in desktop
File renamed without changes
0 ...roidMain/res/mipmap-mdpi/ic_launcher.webp → ...src/main/res/mipmap-mdpi/ic_launcher.webp
View file
Open in desktop
File renamed without changes
0 ...s/mipmap-mdpi/ic_launcher_foreground.webp → ...s/mipmap-mdpi/ic_launcher_foreground.webp
View file
Open in desktop
File renamed without changes
0 ...in/res/mipmap-mdpi/ic_launcher_round.webp → ...in/res/mipmap-mdpi/ic_launcher_round.webp
View file
Open in desktop
File renamed without changes
0 ...oidMain/res/mipmap-xhdpi/ic_launcher.webp → ...rc/main/res/mipmap-xhdpi/ic_launcher.webp
View file
Open in desktop
File renamed without changes
0 .../mipmap-xhdpi/ic_launcher_foreground.webp → .../mipmap-xhdpi/ic_launcher_foreground.webp
View file
Open in desktop
File renamed without changes
0 ...n/res/mipmap-xhdpi/ic_launcher_round.webp → ...n/res/mipmap-xhdpi/ic_launcher_round.webp
View file
Open in desktop
File renamed without changes
0 ...idMain/res/mipmap-xxhdpi/ic_launcher.webp → ...c/main/res/mipmap-xxhdpi/ic_launcher.webp
View file
Open in desktop
File renamed without changes
0 ...mipmap-xxhdpi/ic_launcher_foreground.webp → ...mipmap-xxhdpi/ic_launcher_foreground.webp
View file
Open in desktop
File renamed without changes
0 .../res/mipmap-xxhdpi/ic_launcher_round.webp → .../res/mipmap-xxhdpi/ic_launcher_round.webp
View file
Open in desktop
File renamed without changes
0 ...dMain/res/mipmap-xxxhdpi/ic_launcher.webp → .../main/res/mipmap-xxxhdpi/ic_launcher.webp
View file
Open in desktop
File renamed without changes
0 ...ipmap-xxxhdpi/ic_launcher_foreground.webp → ...ipmap-xxxhdpi/ic_launcher_foreground.webp
View file
Open in desktop
File renamed without changes
0 ...res/mipmap-xxxhdpi/ic_launcher_round.webp → ...res/mipmap-xxxhdpi/ic_launcher_round.webp
View file
Open in desktop
File renamed without changes
0 ...ain/res/values/ic_launcher_background.xml → ...ain/res/values/ic_launcher_background.xml
View file
Open in desktop
File renamed without changes.
0 ...pp/src/androidMain/res/values/strings.xml → ...ndroidApp/src/main/res/values/strings.xml
View file
Open in desktop
File renamed without changes.
50 changes: 12 additions & 38 deletions kotlin-multiplatform/sample/composeApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget

plugins {
alias(libs.plugins.jetbrains.kotlin.multiplatform)
alias(libs.plugins.android.application)
alias(libs.plugins.android.kotlin.multiplatform.library)
alias(libs.plugins.jetbrains.compose)
alias(libs.plugins.jetbrains.kotlin.compose)
alias(libs.plugins.jetbrains.kotlin.serialization)
Expand All @@ -16,11 +16,18 @@ kotlin {
freeCompilerArgs.add("-Xcontext-sensitive-resolution")
}

androidTarget {
androidLibrary {
namespace = "glass.yasan.toolkit.sample"
compileSdk = libs.versions.sample.android.sdk.compile.get().toInt()
minSdk = libs.versions.sample.android.sdk.min.get().toInt()

androidResources.enable = true

compilerOptions {
jvmTarget.set(JvmTarget.JVM_11)
}
}

jvm()

@OptIn(ExperimentalWasmDsl::class)
Expand Down Expand Up @@ -78,45 +85,12 @@ kotlin {
implementation(libs.jetbrains.kotlinx.coroutines.swing)
}
}
androidMain {
dependencies {
implementation(compose.preview)
implementation(libs.androidx.activity.compose)
implementation(libs.koin.android)
}
}
}
}

android {
namespace = "glass.yasan.toolkit.sample"
compileSdk = libs.versions.sample.android.sdk.compile.get().toInt()

defaultConfig {
applicationId = "glass.yasan.toolkit.sample"
minSdk = libs.versions.sample.android.sdk.min.get().toInt()
targetSdk = libs.versions.sample.android.sdk.target.get().toInt()
versionCode = 1
versionName = "1.0.0"
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
}
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}

dependencies {
debugImplementation(compose.uiTooling)
compose.resources {
packageOfResClass = "glass.yasan.toolkit.sample"
generateResClass = auto
}

compose.desktop {
Expand Down
6 changes: 3 additions & 3 deletions ...ple/composeApp/src/commonMain/kotlin/glass/yasan/toolkit/sample/navigation/AboutScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import androidx.compose.ui.unit.dp
import glass.yasan.kepko.component.Icon
import glass.yasan.kepko.foundation.theme.KepkoTheme
import glass.yasan.toolkit.about.presentation.compose.ToolkitDeveloperContent
import glass.yasan.toolkit.composeapp.generated.resources.Res
import glass.yasan.toolkit.composeapp.generated.resources.arrow_back
import glass.yasan.toolkit.composeapp.generated.resources.go_back
import glass.yasan.toolkit.sample.Res
import glass.yasan.toolkit.sample.arrow_back
import glass.yasan.toolkit.sample.go_back
import org.jetbrains.compose.resources.painterResource
import org.jetbrains.compose.resources.stringResource

Expand Down
Loading
Loading