-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Remove unused kotlinx.serialization * Migrate to kotlin 2.0 * Change all 'java' folders to 'kotlin' * Support Kotlin Multiplatform * Add convention plugin for metalava * Support KMP for ios * Support KMP for macos * Adjust CI timeout * Fix navigation for samples * Increase CI timeout
- Loading branch information
Showing
96 changed files
with
1,079 additions
and
258 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
build-logic/convention/src/main/kotlin/KotlinAndroidConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| import org.gradle.api.Plugin | ||
| import org.gradle.api.Project | ||
| import soup.compose.material.motion.buildlogic.configureKotlin | ||
|
|
||
| class KotlinAndroidConventionPlugin: Plugin<Project> { | ||
| override fun apply(target: Project) { | ||
| with(target) { | ||
| with(pluginManager) { | ||
| apply("org.jetbrains.kotlin.android") | ||
| } | ||
|
|
||
| configureKotlin() | ||
| } | ||
| } | ||
| } |
42 changes: 42 additions & 0 deletions
42
build-logic/convention/src/main/kotlin/KotlinMultiplatformConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import org.gradle.api.Plugin | ||
| import org.gradle.api.Project | ||
| import org.gradle.kotlin.dsl.configure | ||
| import org.gradle.kotlin.dsl.getByType | ||
| import org.jetbrains.kotlin.gradle.dsl.KotlinMultiplatformExtension | ||
| import soup.compose.material.motion.buildlogic.configureKotlin | ||
|
|
||
| class KotlinMultiplatformConventionPlugin : Plugin<Project> { | ||
| override fun apply(target: Project) { | ||
| with(target) { | ||
| pluginManager.apply("org.jetbrains.kotlin.multiplatform") | ||
|
|
||
| kotlin { | ||
| applyDefaultHierarchyTemplate() | ||
|
|
||
| if (pluginManager.hasPlugin("com.android.library")) { | ||
| androidTarget { | ||
| publishLibraryVariants("release") | ||
| } | ||
| } | ||
|
|
||
| jvm() | ||
|
|
||
| iosX64() | ||
| iosArm64() | ||
| iosSimulatorArm64() | ||
|
|
||
| macosX64() | ||
| macosArm64() | ||
|
|
||
| configureKotlin() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| internal fun Project.kotlin(action: KotlinMultiplatformExtension.() -> Unit) { | ||
| extensions.configure<KotlinMultiplatformExtension>(action) | ||
| } | ||
|
|
||
| internal val Project.kotlin: KotlinMultiplatformExtension | ||
| get() = extensions.getByType<KotlinMultiplatformExtension>() |
24 changes: 24 additions & 0 deletions
24
build-logic/convention/src/main/kotlin/MetalavaConventionPlugin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import me.tylerbwong.gradle.metalava.extension.MetalavaExtension | ||
| import org.gradle.api.Plugin | ||
| import org.gradle.api.Project | ||
| import org.gradle.kotlin.dsl.configure | ||
|
|
||
| class MetalavaConventionPlugin : Plugin<Project> { | ||
| override fun apply(target: Project) = with(target) { | ||
| with(pluginManager) { | ||
| apply("me.tylerbwong.gradle.metalava") | ||
| } | ||
|
|
||
| metalava { | ||
| filename.set("api/current.api") | ||
| sourcePaths.setFrom( | ||
| target.kotlin.sourceSets | ||
| .filterNot { it.name.contains("test", ignoreCase = true) } | ||
| .flatMap { it.kotlin.sourceDirectories }, | ||
| ) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun Project.metalava(action: MetalavaExtension.() -> Unit) = | ||
| extensions.configure<MetalavaExtension>(action) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 6 additions & 14 deletions
20
build-logic/convention/src/main/kotlin/soup/compose/material/motion/buildlogic/Compose.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,15 @@ | ||
| package soup.compose.material.motion.buildlogic | ||
|
|
||
| import com.android.build.gradle.BaseExtension | ||
| import org.gradle.api.Project | ||
| import org.gradle.api.artifacts.VersionCatalogsExtension | ||
| import org.gradle.kotlin.dsl.assign | ||
| import org.gradle.kotlin.dsl.configure | ||
| import org.gradle.kotlin.dsl.getByType | ||
| import org.jetbrains.kotlin.compose.compiler.gradle.ComposeCompilerGradlePluginExtension | ||
|
|
||
| fun Project.configureCompose() { | ||
| val libs = extensions.getByType<VersionCatalogsExtension>().named("libs") | ||
| android { | ||
| buildFeatures.compose = true | ||
| pluginManager.apply("org.jetbrains.compose") | ||
| pluginManager.apply("org.jetbrains.kotlin.plugin.compose") | ||
|
|
||
| composeOptions { | ||
| kotlinCompilerExtensionVersion = | ||
| libs.findVersion("compose-compiler").get().toString() | ||
| } | ||
| extensions.configure<ComposeCompilerGradlePluginExtension> { | ||
| enableStrongSkippingMode = false | ||
| } | ||
| } | ||
|
|
||
| private fun Project.android(action: BaseExtension.() -> Unit) { | ||
| extensions.configure(action) | ||
| } |
15 changes: 9 additions & 6 deletions
15
build-logic/convention/src/main/kotlin/soup/compose/material/motion/buildlogic/Kotlin.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,54 +1,32 @@ | ||
| plugins { | ||
| id("mmc.android.library") | ||
| id("mmc.android.compose") | ||
| id("mmc.kotlin.multiplatform") | ||
| id("mmc.compose") | ||
| id("mmc.metalava") | ||
| alias(libs.plugins.maven.publish) | ||
| alias(libs.plugins.jetbrains.dokka) | ||
| alias(libs.plugins.metalava) | ||
| } | ||
|
|
||
| android { | ||
| namespace 'soup.compose.material.motion' | ||
| kotlinOptions { | ||
| freeCompilerArgs += '-Xexplicit-api=warning' | ||
| } | ||
| lint { | ||
| textReport true | ||
| textOutput file('stdout') | ||
| checkReleaseBuilds false | ||
| } | ||
| testOptions { | ||
| unitTests { | ||
| includeAndroidResources = true | ||
| kotlin { | ||
| explicitApi() | ||
| sourceSets { | ||
| commonMain.dependencies { | ||
| implementation(compose.animation) | ||
| implementation(compose.ui) | ||
| implementation(libs.androidx.annotation) | ||
| } | ||
| } | ||
| packagingOptions { | ||
| resources { | ||
| excludes += ['/META-INF/AL2.0', '/META-INF/LGPL2.1'] | ||
| androidInstrumentedTest.dependencies { | ||
| implementation(libs.androidx.test.core) | ||
| implementation(libs.androidx.test.rules) | ||
| implementation(libs.androidx.test.runner) | ||
| implementation(libs.compose.foundation) | ||
| implementation(libs.compose.ui.testJunit4) | ||
| implementation(libs.compose.ui.testManifest) | ||
| implementation(libs.androidx.tracing) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| metalava { | ||
| sourcePaths.setFrom("src/main") | ||
| filename.set("api/current.api") | ||
| reportLintsAsErrors.set(true) | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation libs.kotlin.stdlib | ||
| implementation libs.compose.animation | ||
| implementation libs.compose.runtime | ||
| implementation libs.compose.ui.ui | ||
|
|
||
| // ====================== | ||
| // Test dependencies | ||
| // ====================== | ||
|
|
||
| androidTestImplementation libs.androidx.test.core | ||
| androidTestImplementation libs.androidx.test.rules | ||
| androidTestImplementation libs.androidx.test.runner | ||
| androidTestImplementation libs.compose.foundation | ||
| androidTestImplementation libs.compose.ui.testJunit4 | ||
| debugImplementation libs.compose.ui.testManifest | ||
| debugImplementation libs.androidx.tracing | ||
| android { | ||
| namespace 'soup.compose.material.motion' | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.