Fix dokka and maven-publish (#229)

* Fix dokka and maven-publish

* clean up libs.versions.toml

.github/workflows/build.yaml

@@ -143,7 +143,7 @@ jobs:
   deploy:
     if: github.event_name == 'push' && github.repository == 'fornewid/material-motion-compose'
 
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     needs: [ build, test ]
     timeout-minutes: 30
     env:

.github/workflows/publish-docs.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   update_draft_release:
     if: github.repository == 'fornewid/material-motion-compose'
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
     env:
       TERM: dumb
 

build.gradle

@@ -50,7 +50,7 @@ subprojects {
                 noAndroidSdkLink.set(false)
 
                 // Add samples from :sample module
-                samples.from(rootProject.file("app/src/main/java/"))
+                samples.from(rootProject.file("sample/shared/src/commonMain/kotlin/"))
 
                 // AndroidX + Compose docs
                 externalDocumentationLink {
@@ -63,9 +63,9 @@ subprojects {
                 }
 
                 sourceLink {
-                    localDirectory.set(project.file("src/main/java"))
+                    localDirectory.set(project.file("src/commonMain/kotlin"))
                     // URL showing where the source code can be accessed through the web browser
-                    remoteUrl.set(new URL("https://github.com/fornewid/material-motion-compose/blob/main/${project.name}/src/main/java"))
+                    remoteUrl.set(new URL("https://github.com/fornewid/material-motion-compose/blob/main/${project.name}/src/commonMain/kotlin"))
                     // Suffix which is used to append the line number to the URL. Use #L for GitHub
                     remoteLineSuffix.set("#L")
                 }

core/build.gradle → core/build.gradle.kts

@@ -28,5 +28,5 @@ kotlin {
 }
 
 android {
-    namespace 'soup.compose.material.motion'
+    namespace = "soup.compose.material.motion"
 }

gradle/libs.versions.toml

@@ -1,12 +1,12 @@
 [versions]
 
 agp = "8.4.1"
-mavenPublish = "0.25.2"
+mavenPublish = "0.28.0"
 metalava = "0.3.5"
 
 # Kotlin
 kotlin = "2.0.0"
-dokka = "1.8.10"
+dokka = "1.9.20"
 
 # Compose
 compose = "1.7.0-beta02"
@@ -20,21 +20,11 @@ androidx-tracing = "1.1.0"
 
 [libraries]
 
-# Kotlin
-
-kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
-
 # Compose
 
-compose-runtime = { module = "androidx.compose.runtime:runtime", version.ref = "compose" }
 compose-foundation = { module = "androidx.compose.foundation:foundation", version.ref = "compose" }
-compose-ui-ui = { module = "androidx.compose.ui:ui", version.ref = "compose" }
 compose-ui-testJunit4 = { module = "androidx.compose.ui:ui-test-junit4", version.ref = "compose" }
 compose-ui-testManifest = { module = "androidx.compose.ui:ui-test-manifest", version.ref = "compose" }
-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling", version.ref = "compose" }
-compose-material = { module = "androidx.compose.material:material", version.ref = "compose" }
-compose-materialIconsExtended = { module = "androidx.compose.material:material-icons-extended", version.ref = "compose" }
-compose-animation = { module = "androidx.compose.animation:animation", version.ref = "compose" }
 
 jetbrains-navigation-compose = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "navigation" }
 

sample/android/build.gradle.kts

@@ -0,0 +1,36 @@
+plugins {
+    id("mmc.android.application")
+    id("mmc.kotlin.android")
+    id("mmc.compose")
+}
+
+android {
+    namespace = "soup.compose.material.motion.sample"
+    defaultConfig {
+        applicationId = "soup.material.compose.sample"
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildTypes {
+        release {
+            isMinifyEnabled = true
+            signingConfig = signingConfigs["debug"]
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro",
+            )
+        }
+    }
+    packaging {
+        resources.excludes += setOf(
+            "/META-INF/AL2.0",
+            "/META-INF/LGPL2.1",
+        )
+    }
+}
+
+dependencies {
+    implementation(projects.core)
+    implementation(projects.sample.shared)
+    implementation(libs.androidx.activity.compose)
+}