Setup publications for kompass-android and kompass-core

nasirky · Apr 21, 2019 · 79c509c · 79c509c
1 parent ea22ca3
commit 79c509c
Show file tree

Hide file tree

Showing 89 changed files with 97 additions and 36 deletions.
diff --git a/android-example--fragment/build.gradle.kts b/android-example--fragment/build.gradle.kts
@@ -29,5 +29,5 @@ dependencies {
     androidTestImplementation(Deps.Android.X.testRules)
     androidTestImplementation(Deps.Android.X.testRunner)
     androidTestImplementation(Deps.Android.X.junit)
-    implementation(project(":android"))
+    implementation(project(":kompass-android"))
 }
diff --git a/android-test-base/build.gradle.kts b/android-test-base/build.gradle.kts
@@ -17,12 +17,13 @@ androidExtensions {
     isExperimental = true
 }
 
+
 dependencies {
     api(Deps.Kotlin.StdLib.jdk)
     api(Deps.Android.X.appCompat)
     api(Deps.Android.X.espresso)
     api(Deps.Android.X.testRunner)
     api(Deps.Android.X.testRules)
     api(Deps.Android.X.junit)
-    api(project(":android"))
+    api(project(":kompass-android"))
 }
diff --git a/android/build.gradle.kts b/android/build.gradle.kts
diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt
@@ -0,0 +1,17 @@
+object Library {
+    const val group = "io.sellmair"
+    const val version = "0.2.0-pre-alpha.0"
+
+    object Core {
+        const val name = "kompass-core"
+
+        object Jvm {
+            const val name = "kompass-core-jvm"
+        }
+    }
+
+    object Android {
+        const val name = "kompass-android"
+    }
+
+}
diff --git a/kompass-android/build.gradle.kts b/kompass-android/build.gradle.kts
@@ -0,0 +1,65 @@
+plugins {
+    id("com.android.library")
+    kotlin("android")
+    id("org.jetbrains.kotlin.android.extensions")
+    `maven-publish`
+}
+
+android {
+    compileSdkVersion(Project.Android.compileSdkVersion)
+    defaultConfig {
+        targetSdkVersion(Project.Android.targetSdkVersion)
+        minSdkVersion(Project.Android.minSdkVersion)
+    }
+}
+
+androidExtensions {
+    isExperimental = true
+}
+
+dependencies {
+    /* Kotlin */
+    implementation(Deps.Kotlin.StdLib.jdk)
+
+    /* Android X */
+    implementation(Deps.Android.X.lifecycleExtensions)
+    implementation(Deps.Android.X.lifecycleViewModel)
+    implementation(Deps.Android.X.fragment)
+
+
+    api(project(":kompass-core"))
+
+}
+
+
+//region Publishing
+
+val sourcesJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("sources")
+    from(android.sourceSets["main"].java.srcDirs)
+}
+
+publishing {
+    publications {
+        create<MavenPublication>("aar") {
+            groupId = Library.group
+            version = Library.version
+            artifactId = Library.Android.name
+
+            artifact(file("$buildDir/outputs/aar/kompass-android-release.aar"))
+            artifact(sourcesJar.get())
+
+            pom.withXml {
+                asNode().appendNode("dependencies").apply {
+                    val dependencyNode = appendNode("dependency")
+                    dependencyNode.appendNode("groupId", Library.group)
+                    dependencyNode.appendNode("artifactId", Library.Core.Jvm.name)
+                    dependencyNode.appendNode("version", Library.version)
+                }
+            }
+        }
+    }
+}
+
+
+//endregion
diff --git a/android/src/main/AndroidManifest.xml → kompass-android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml → kompass-android/src/main/AndroidManifest.xml
diff --git a/...io/sellmair/kompass/android/EmptyRoute.kt → ...io/sellmair/kompass/android/EmptyRoute.kt b/...io/sellmair/kompass/android/EmptyRoute.kt → ...io/sellmair/kompass/android/EmptyRoute.kt
diff --git a/...ellmair/kompass/android/GetRouteSyntax.kt → ...ellmair/kompass/android/GetRouteSyntax.kt b/...ellmair/kompass/android/GetRouteSyntax.kt → ...ellmair/kompass/android/GetRouteSyntax.kt
diff --git a/...sellmair/kompass/android/ParcelableKey.kt → ...sellmair/kompass/android/ParcelableKey.kt b/...sellmair/kompass/android/ParcelableKey.kt → ...sellmair/kompass/android/ParcelableKey.kt
diff --git a/...kompass/android/ParcelableRoutingStack.kt → ...kompass/android/ParcelableRoutingStack.kt b/...kompass/android/ParcelableRoutingStack.kt → ...kompass/android/ParcelableRoutingStack.kt
diff --git a/...io/sellmair/kompass/android/Parcelizer.kt → ...io/sellmair/kompass/android/Parcelizer.kt b/...io/sellmair/kompass/android/Parcelizer.kt → ...io/sellmair/kompass/android/Parcelizer.kt
diff --git a/...ompass/android/RoutingStack+parcelable.kt → ...ompass/android/RoutingStack+parcelable.kt b/...ompass/android/RoutingStack+parcelable.kt → ...ompass/android/RoutingStack+parcelable.kt
diff --git a/...r/kompass/android/WrongThreadException.kt → ...r/kompass/android/WrongThreadException.kt b/...r/kompass/android/WrongThreadException.kt → ...r/kompass/android/WrongThreadException.kt
diff --git a/...d/fragment/DefaultFragmentStackPatcher.kt → ...d/fragment/DefaultFragmentStackPatcher.kt b/...d/fragment/DefaultFragmentStackPatcher.kt → ...d/fragment/DefaultFragmentStackPatcher.kt
diff --git a/...kompass/android/fragment/EmptyFragment.kt → ...kompass/android/fragment/EmptyFragment.kt b/...kompass/android/fragment/EmptyFragment.kt → ...kompass/android/fragment/EmptyFragment.kt
diff --git a/...pass/android/fragment/EmptyFragmentMap.kt → ...pass/android/fragment/EmptyFragmentMap.kt b/...pass/android/fragment/EmptyFragmentMap.kt → ...pass/android/fragment/EmptyFragmentMap.kt
diff --git a/...oid/fragment/FragmentActivityExtension.kt → ...oid/fragment/FragmentActivityExtension.kt b/...oid/fragment/FragmentActivityExtension.kt → ...oid/fragment/FragmentActivityExtension.kt
diff --git a/...ass/android/fragment/FragmentContainer.kt → ...ass/android/fragment/FragmentContainer.kt b/...ass/android/fragment/FragmentContainer.kt → ...ass/android/fragment/FragmentContainer.kt
diff --git a/...mpass/android/fragment/FragmentElement.kt → ...mpass/android/fragment/FragmentElement.kt b/...mpass/android/fragment/FragmentElement.kt → ...mpass/android/fragment/FragmentElement.kt
diff --git a/...ndroid/fragment/FragmentGetRouteSyntax.kt → ...ndroid/fragment/FragmentGetRouteSyntax.kt b/...ndroid/fragment/FragmentGetRouteSyntax.kt → ...ndroid/fragment/FragmentGetRouteSyntax.kt
diff --git a/...pass/android/fragment/FragmentMap+plus.kt → ...pass/android/fragment/FragmentMap+plus.kt b/...pass/android/fragment/FragmentMap+plus.kt → ...pass/android/fragment/FragmentMap+plus.kt
diff --git a/...r/kompass/android/fragment/FragmentMap.kt → ...r/kompass/android/fragment/FragmentMap.kt b/...r/kompass/android/fragment/FragmentMap.kt → ...r/kompass/android/fragment/FragmentMap.kt
diff --git a/...agment/FragmentMappingMissingException.kt → ...agment/FragmentMappingMissingException.kt b/...agment/FragmentMappingMissingException.kt → ...agment/FragmentMappingMissingException.kt
diff --git a/...kompass/android/fragment/FragmentRoute.kt → ...kompass/android/fragment/FragmentRoute.kt b/...kompass/android/fragment/FragmentRoute.kt → ...kompass/android/fragment/FragmentRoute.kt
diff --git a/.../android/fragment/FragmentRouteStorage.kt → .../android/fragment/FragmentRouteStorage.kt b/.../android/fragment/FragmentRouteStorage.kt → .../android/fragment/FragmentRouteStorage.kt
diff --git a/...ompass/android/fragment/FragmentRouter.kt → ...ompass/android/fragment/FragmentRouter.kt b/...ompass/android/fragment/FragmentRouter.kt → ...ompass/android/fragment/FragmentRouter.kt
diff --git a/...d/fragment/FragmentRoutingStackBundler.kt → ...d/fragment/FragmentRoutingStackBundler.kt b/...d/fragment/FragmentRoutingStackBundler.kt → ...d/fragment/FragmentRoutingStackBundler.kt
diff --git a/.../android/fragment/FragmentStackPatcher.kt → .../android/fragment/FragmentStackPatcher.kt b/.../android/fragment/FragmentStackPatcher.kt → .../android/fragment/FragmentStackPatcher.kt
diff --git a/...droid/fragment/FragmentTransition+plus.kt → ...droid/fragment/FragmentTransition+plus.kt b/...droid/fragment/FragmentTransition+plus.kt → ...droid/fragment/FragmentTransition+plus.kt
diff --git a/...oid/fragment/GenericFragmentTransition.kt → ...oid/fragment/GenericFragmentTransition.kt b/...oid/fragment/GenericFragmentTransition.kt → ...oid/fragment/GenericFragmentTransition.kt
diff --git a/...mpass/android/fragment/KompassFragment.kt → ...mpass/android/fragment/KompassFragment.kt b/...mpass/android/fragment/KompassFragment.kt → ...mpass/android/fragment/KompassFragment.kt
diff --git a/...droid/fragment/KompassFragmentActivity.kt → ...droid/fragment/KompassFragmentActivity.kt b/...droid/fragment/KompassFragmentActivity.kt → ...droid/fragment/KompassFragmentActivity.kt
diff --git a/...oid/fragment/KompassFragmentTransition.kt → ...oid/fragment/KompassFragmentTransition.kt b/...oid/fragment/KompassFragmentTransition.kt → ...oid/fragment/KompassFragmentTransition.kt
diff --git a/...ragment/ParcelableFragmentRouteStorage.kt → ...ragment/ParcelableFragmentRouteStorage.kt b/...ragment/ParcelableFragmentRouteStorage.kt → ...ragment/ParcelableFragmentRouteStorage.kt
diff --git a/.../ParcelableFragmentRoutingStackBundler.kt → .../ParcelableFragmentRoutingStackBundler.kt b/.../ParcelableFragmentRoutingStackBundler.kt → .../ParcelableFragmentRoutingStackBundler.kt
diff --git a/...t/PopRetainRootImmediateOrFinishSyntax.kt → ...t/PopRetainRootImmediateOrFinishSyntax.kt b/...t/PopRetainRootImmediateOrFinishSyntax.kt → ...t/PopRetainRootImmediateOrFinishSyntax.kt
diff --git a/.../fragment/PopRetainRootImmediateSyntax.kt → .../fragment/PopRetainRootImmediateSyntax.kt b/.../fragment/PopRetainRootImmediateSyntax.kt → .../fragment/PopRetainRootImmediateSyntax.kt
diff --git a/...id/fragment/PreparedFragmentRouteStack.kt → ...id/fragment/PreparedFragmentRouteStack.kt b/...id/fragment/PreparedFragmentRouteStack.kt → ...id/fragment/PreparedFragmentRouteStack.kt
diff --git a/...ndroid/fragment/dsl/FragmentMapBuilder.kt → ...ndroid/fragment/dsl/FragmentMapBuilder.kt b/...ndroid/fragment/dsl/FragmentMapBuilder.kt → ...ndroid/fragment/dsl/FragmentMapBuilder.kt
diff --git a/...oid/fragment/dsl/FragmentRouterBuilder.kt → ...oid/fragment/dsl/FragmentRouterBuilder.kt b/...oid/fragment/dsl/FragmentRouterBuilder.kt → ...oid/fragment/dsl/FragmentRouterBuilder.kt
diff --git a/...android/fragment/dsl/FragmentRouterDsl.kt → ...android/fragment/dsl/FragmentRouterDsl.kt b/...android/fragment/dsl/FragmentRouterDsl.kt → ...android/fragment/dsl/FragmentRouterDsl.kt
diff --git a/...agment/dsl/KompassFragmentDslException.kt → ...agment/dsl/KompassFragmentDslException.kt b/...agment/dsl/KompassFragmentDslException.kt → ...agment/dsl/KompassFragmentDslException.kt
diff --git a/...android/fragment/dsl/LambdaFragmentMap.kt → ...android/fragment/dsl/LambdaFragmentMap.kt b/...android/fragment/dsl/LambdaFragmentMap.kt → ...android/fragment/dsl/LambdaFragmentMap.kt
diff --git a/...gment/internal/EmptyFragmentTransition.kt → ...gment/internal/EmptyFragmentTransition.kt b/...gment/internal/EmptyFragmentTransition.kt → ...gment/internal/EmptyFragmentTransition.kt
diff --git a/.../fragment/internal/FragmentElementImpl.kt → .../fragment/internal/FragmentElementImpl.kt b/.../fragment/internal/FragmentElementImpl.kt → .../fragment/internal/FragmentElementImpl.kt
diff --git a/...t/internal/FragmentRouterConfiguration.kt → ...t/internal/FragmentRouterConfiguration.kt b/...t/internal/FragmentRouterConfiguration.kt → ...t/internal/FragmentRouterConfiguration.kt
diff --git a/...ternal/FragmentRouterLifecycleObserver.kt → ...ternal/FragmentRouterLifecycleObserver.kt b/...ternal/FragmentRouterLifecycleObserver.kt → ...ternal/FragmentRouterLifecycleObserver.kt
diff --git a/...rnal/GenericFragmentContainerLifecycle.kt → ...rnal/GenericFragmentContainerLifecycle.kt b/...rnal/GenericFragmentContainerLifecycle.kt → ...rnal/GenericFragmentContainerLifecycle.kt
diff --git a/...ernal/ReifiedGenericFragmentTransition.kt → ...ernal/ReifiedGenericFragmentTransition.kt b/...ernal/ReifiedGenericFragmentTransition.kt → ...ernal/ReifiedGenericFragmentTransition.kt
diff --git a/...GenericKompassFragmentTransition+erase.kt → ...GenericKompassFragmentTransition+erase.kt b/...GenericKompassFragmentTransition+erase.kt → ...GenericKompassFragmentTransition+erase.kt
diff --git a/...android/fragment/internal/createUnsafe.kt → ...android/fragment/internal/createUnsafe.kt b/...android/fragment/internal/createUnsafe.kt → ...android/fragment/internal/createUnsafe.kt
diff --git a/...gment/setup/ActivityFragmentRouterHost.kt → ...gment/setup/ActivityFragmentRouterHost.kt b/...gment/setup/ActivityFragmentRouterHost.kt → ...gment/setup/ActivityFragmentRouterHost.kt
diff --git a/...etup/ActivityFragmentRouterSetupSyntax.kt → ...etup/ActivityFragmentRouterSetupSyntax.kt b/...etup/ActivityFragmentRouterSetupSyntax.kt → ...etup/ActivityFragmentRouterSetupSyntax.kt
diff --git a/...ctivityInvokeOnSaveInstanceStateSyntax.kt → ...ctivityInvokeOnSaveInstanceStateSyntax.kt b/...ctivityInvokeOnSaveInstanceStateSyntax.kt → ...ctivityInvokeOnSaveInstanceStateSyntax.kt
diff --git a/...roid/fragment/setup/FragmentExtensions.kt → ...roid/fragment/setup/FragmentExtensions.kt b/...roid/fragment/setup/FragmentExtensions.kt → ...roid/fragment/setup/FragmentExtensions.kt
diff --git a/...gment/setup/FragmentFragmentRouterHost.kt → ...gment/setup/FragmentFragmentRouterHost.kt b/...gment/setup/FragmentFragmentRouterHost.kt → ...gment/setup/FragmentFragmentRouterHost.kt
diff --git a/...etup/FragmentFragmentRouterSetupSyntax.kt → ...etup/FragmentFragmentRouterSetupSyntax.kt b/...etup/FragmentFragmentRouterSetupSyntax.kt → ...etup/FragmentFragmentRouterSetupSyntax.kt
diff --git a/...ragmentInvokeOnSaveInstanceStateSyntax.kt → ...ragmentInvokeOnSaveInstanceStateSyntax.kt b/...ragmentInvokeOnSaveInstanceStateSyntax.kt → ...ragmentInvokeOnSaveInstanceStateSyntax.kt
diff --git a/...roid/fragment/setup/FragmentRouterHost.kt → ...roid/fragment/setup/FragmentRouterHost.kt b/...roid/fragment/setup/FragmentRouterHost.kt → ...roid/fragment/setup/FragmentRouterHost.kt
diff --git a/...agment/setup/FragmentRouterSetupSyntax.kt → ...agment/setup/FragmentRouterSetupSyntax.kt b/...agment/setup/FragmentRouterSetupSyntax.kt → ...agment/setup/FragmentRouterSetupSyntax.kt
diff --git a/.../setup/InvokeOnHostSetupSyntaxInstance.kt → .../setup/InvokeOnHostSetupSyntaxInstance.kt b/.../setup/InvokeOnHostSetupSyntaxInstance.kt → .../setup/InvokeOnHostSetupSyntaxInstance.kt
diff --git a/.../setup/InvokeOnSaveInstanceStateSyntax.kt → .../setup/InvokeOnSaveInstanceStateSyntax.kt b/.../setup/InvokeOnSaveInstanceStateSyntax.kt → .../setup/InvokeOnSaveInstanceStateSyntax.kt
diff --git a/...ment/setup/OnSaveInstanceStateCallback.kt → ...ment/setup/OnSaveInstanceStateCallback.kt b/...ment/setup/OnSaveInstanceStateCallback.kt → ...ment/setup/OnSaveInstanceStateCallback.kt
diff --git a/...sellmair/kompass/android/utils/Logging.kt → ...sellmair/kompass/android/utils/Logging.kt b/...sellmair/kompass/android/utils/Logging.kt → ...sellmair/kompass/android/utils/Logging.kt
diff --git a/...air/kompass/android/utils/isMainThread.kt → ...air/kompass/android/utils/isMainThread.kt b/...air/kompass/android/utils/isMainThread.kt → ...air/kompass/android/utils/isMainThread.kt
diff --git a/...lmair/kompass/android/utils/mainThread.kt → ...lmair/kompass/android/utils/mainThread.kt b/...lmair/kompass/android/utils/mainThread.kt → ...lmair/kompass/android/utils/mainThread.kt
diff --git a/...ompass/android/utils/mainThreadHandler.kt → ...ompass/android/utils/mainThreadHandler.kt b/...ompass/android/utils/mainThreadHandler.kt → ...ompass/android/utils/mainThreadHandler.kt
diff --git a/...ompass/android/utils/requireMainThread.kt → ...ompass/android/utils/requireMainThread.kt b/...ompass/android/utils/requireMainThread.kt → ...ompass/android/utils/requireMainThread.kt
diff --git a/core/build.gradle.kts → kompass-core/build.gradle.kts b/core/build.gradle.kts → kompass-core/build.gradle.kts
@@ -1,9 +1,19 @@
 @file:Suppress("UNUSED_VARIABLE")
 
+
 plugins {
     kotlin("multiplatform")
+    `maven-publish`
 }
 
+
+// TODO work around for https://youtrack.jetbrains.com/issue/KT-27170
+configurations.create("compileClasspath")
+
+group = Library.group
+version = Library.version
+
+
 kotlin {
     macosX64("macos")
     jvm("jvm")

diff --git a/...in/kotlin/io/sellmair/kompass/core/Key.kt → ...in/kotlin/io/sellmair/kompass/core/Key.kt b/...in/kotlin/io/sellmair/kompass/core/Key.kt → ...in/kotlin/io/sellmair/kompass/core/Key.kt
diff --git a/...n/io/sellmair/kompass/core/MultiRouter.kt → ...n/io/sellmair/kompass/core/MultiRouter.kt b/...n/io/sellmair/kompass/core/MultiRouter.kt → ...n/io/sellmair/kompass/core/MultiRouter.kt
diff --git a/.../kotlin/io/sellmair/kompass/core/Route.kt → .../kotlin/io/sellmair/kompass/core/Route.kt b/.../kotlin/io/sellmair/kompass/core/Route.kt → .../kotlin/io/sellmair/kompass/core/Route.kt
diff --git a/...kotlin/io/sellmair/kompass/core/Router.kt → ...kotlin/io/sellmair/kompass/core/Router.kt b/...kotlin/io/sellmair/kompass/core/Router.kt → ...kotlin/io/sellmair/kompass/core/Router.kt
diff --git a/...ellmair/kompass/core/RouterInstruction.kt → ...ellmair/kompass/core/RouterInstruction.kt b/...ellmair/kompass/core/RouterInstruction.kt → ...ellmair/kompass/core/RouterInstruction.kt
diff --git a/.../io/sellmair/kompass/core/RoutingStack.kt → .../io/sellmair/kompass/core/RoutingStack.kt b/.../io/sellmair/kompass/core/RoutingStack.kt → .../io/sellmair/kompass/core/RoutingStack.kt
diff --git a/...ir/kompass/core/RoutingStackExtensions.kt → ...ir/kompass/core/RoutingStackExtensions.kt b/...ir/kompass/core/RoutingStackExtensions.kt → ...ir/kompass/core/RoutingStackExtensions.kt
diff --git a/...ass/core/RoutingStackInstructionSyntax.kt → ...ass/core/RoutingStackInstructionSyntax.kt b/...ass/core/RoutingStackInstructionSyntax.kt → ...ass/core/RoutingStackInstructionSyntax.kt
diff --git a/...ompass/core/exception/KompassException.kt → ...ompass/core/exception/KompassException.kt b/...ompass/core/exception/KompassException.kt → ...ompass/core/exception/KompassException.kt
diff --git a/...s/core/exception/MissingRouteException.kt → ...s/core/exception/MissingRouteException.kt b/...s/core/exception/MissingRouteException.kt → ...s/core/exception/MissingRouteException.kt
diff --git a/...mair/kompass/core/internal/ElementImpl.kt → ...mair/kompass/core/internal/ElementImpl.kt b/...mair/kompass/core/internal/ElementImpl.kt → ...mair/kompass/core/internal/ElementImpl.kt
diff --git a/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt b/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt
diff --git a/...kompass/core/internal/RoutingStackImpl.kt → ...kompass/core/internal/RoutingStackImpl.kt b/...kompass/core/internal/RoutingStackImpl.kt → ...kompass/core/internal/RoutingStackImpl.kt
diff --git a/.../sellmair/kompass/core/MultiRouterTest.kt → .../sellmair/kompass/core/MultiRouterTest.kt b/.../sellmair/kompass/core/MultiRouterTest.kt → .../sellmair/kompass/core/MultiRouterTest.kt
diff --git a/...r/kompass/core/RoutingStackElementTest.kt → ...r/kompass/core/RoutingStackElementTest.kt b/...r/kompass/core/RoutingStackElementTest.kt → ...r/kompass/core/RoutingStackElementTest.kt
diff --git a/...core/RoutingStackInstructionSyntaxTest.kt → ...core/RoutingStackInstructionSyntaxTest.kt b/...core/RoutingStackInstructionSyntaxTest.kt → ...core/RoutingStackInstructionSyntaxTest.kt
diff --git a/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt b/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt
diff --git a/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt b/...io/sellmair/kompass/core/internal/Lock.kt → ...io/sellmair/kompass/core/internal/Lock.kt
diff --git a/core/src/main/AndroidManifest.xml → kompass-core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml → kompass-core/src/main/AndroidManifest.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = 'kompass'
 
-include ':core'
-include ':android'
+include ':kompass-core'
+include ':kompass-android'
 include ':android-test-base'
 include ':android-test--fragment'
 include ':android-example--fragment'