diff --git a/android-example--fragment/build.gradle.kts b/android-example--fragment/build.gradle.kts index 5ee2dd4..7ee1a0f 100644 --- 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")) } \ No newline at end of file diff --git a/android-test-base/build.gradle.kts b/android-test-base/build.gradle.kts index 7086d82..ff0651f 100644 --- a/android-test-base/build.gradle.kts +++ b/android-test-base/build.gradle.kts @@ -17,6 +17,7 @@ androidExtensions { isExperimental = true } + dependencies { api(Deps.Kotlin.StdLib.jdk) api(Deps.Android.X.appCompat) @@ -24,5 +25,5 @@ dependencies { api(Deps.Android.X.testRunner) api(Deps.Android.X.testRules) api(Deps.Android.X.junit) - api(project(":android")) + api(project(":kompass-android")) } \ No newline at end of file diff --git a/android/build.gradle.kts b/android/build.gradle.kts deleted file mode 100644 index fc3a559..0000000 --- a/android/build.gradle.kts +++ /dev/null @@ -1,32 +0,0 @@ -plugins { - id("com.android.library") - kotlin("android") - id("org.jetbrains.kotlin.android.extensions") -} - -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(":core")) - -} - diff --git a/buildSrc/src/main/kotlin/Library.kt b/buildSrc/src/main/kotlin/Library.kt new file mode 100644 index 0000000..0a1989e --- /dev/null +++ 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" + } + +} \ No newline at end of file diff --git a/kompass-android/build.gradle.kts b/kompass-android/build.gradle.kts new file mode 100644 index 0000000..d8367f9 --- /dev/null +++ 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("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 \ No newline at end of file diff --git a/android/src/main/AndroidManifest.xml b/kompass-android/src/main/AndroidManifest.xml similarity index 100% rename from android/src/main/AndroidManifest.xml rename to kompass-android/src/main/AndroidManifest.xml diff --git a/android/src/main/java/io/sellmair/kompass/android/EmptyRoute.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/EmptyRoute.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/EmptyRoute.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/EmptyRoute.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/GetRouteSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/GetRouteSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/GetRouteSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/GetRouteSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/ParcelableKey.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/ParcelableKey.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/ParcelableKey.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/ParcelableKey.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/ParcelableRoutingStack.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/ParcelableRoutingStack.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/ParcelableRoutingStack.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/ParcelableRoutingStack.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/Parcelizer.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/Parcelizer.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/Parcelizer.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/Parcelizer.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/RoutingStack+parcelable.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/RoutingStack+parcelable.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/RoutingStack+parcelable.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/RoutingStack+parcelable.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/WrongThreadException.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/WrongThreadException.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/WrongThreadException.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/WrongThreadException.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/DefaultFragmentStackPatcher.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/DefaultFragmentStackPatcher.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/DefaultFragmentStackPatcher.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/DefaultFragmentStackPatcher.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragment.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragment.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragment.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragment.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragmentMap.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragmentMap.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragmentMap.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/EmptyFragmentMap.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentActivityExtension.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentActivityExtension.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentActivityExtension.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentActivityExtension.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentContainer.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentContainer.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentContainer.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentContainer.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentElement.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentElement.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentElement.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentElement.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentGetRouteSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentGetRouteSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentGetRouteSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentGetRouteSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap+plus.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap+plus.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap+plus.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap+plus.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMap.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMappingMissingException.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMappingMissingException.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMappingMissingException.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentMappingMissingException.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoute.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoute.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoute.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoute.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouteStorage.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouteStorage.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouteStorage.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouteStorage.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouter.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouter.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouter.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRouter.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoutingStackBundler.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoutingStackBundler.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoutingStackBundler.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentRoutingStackBundler.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentStackPatcher.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentStackPatcher.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentStackPatcher.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentStackPatcher.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/FragmentTransition+plus.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentTransition+plus.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/FragmentTransition+plus.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/FragmentTransition+plus.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/GenericFragmentTransition.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/GenericFragmentTransition.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/GenericFragmentTransition.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/GenericFragmentTransition.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragment.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragment.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragment.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragment.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentActivity.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentActivity.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentActivity.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentActivity.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentTransition.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentTransition.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentTransition.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/KompassFragmentTransition.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRouteStorage.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRouteStorage.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRouteStorage.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRouteStorage.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRoutingStackBundler.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRoutingStackBundler.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRoutingStackBundler.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/ParcelableFragmentRoutingStackBundler.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateOrFinishSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateOrFinishSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateOrFinishSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateOrFinishSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PopRetainRootImmediateSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/PreparedFragmentRouteStack.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PreparedFragmentRouteStack.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/PreparedFragmentRouteStack.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/PreparedFragmentRouteStack.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentMapBuilder.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentMapBuilder.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentMapBuilder.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentMapBuilder.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterBuilder.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterBuilder.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterBuilder.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterBuilder.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterDsl.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterDsl.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterDsl.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/FragmentRouterDsl.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/dsl/KompassFragmentDslException.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/KompassFragmentDslException.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/dsl/KompassFragmentDslException.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/KompassFragmentDslException.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/dsl/LambdaFragmentMap.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/LambdaFragmentMap.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/dsl/LambdaFragmentMap.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/dsl/LambdaFragmentMap.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/EmptyFragmentTransition.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/EmptyFragmentTransition.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/EmptyFragmentTransition.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/EmptyFragmentTransition.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentElementImpl.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentElementImpl.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentElementImpl.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentElementImpl.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterConfiguration.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterConfiguration.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterConfiguration.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterConfiguration.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterLifecycleObserver.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterLifecycleObserver.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterLifecycleObserver.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/FragmentRouterLifecycleObserver.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/GenericFragmentContainerLifecycle.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/GenericFragmentContainerLifecycle.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/GenericFragmentContainerLifecycle.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/GenericFragmentContainerLifecycle.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericFragmentTransition.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericFragmentTransition.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericFragmentTransition.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericFragmentTransition.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericKompassFragmentTransition+erase.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericKompassFragmentTransition+erase.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericKompassFragmentTransition+erase.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/ReifiedGenericKompassFragmentTransition+erase.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/internal/createUnsafe.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/createUnsafe.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/internal/createUnsafe.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/internal/createUnsafe.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterHost.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterHost.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterHost.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterHost.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterSetupSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterSetupSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterSetupSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityFragmentRouterSetupSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityInvokeOnSaveInstanceStateSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityInvokeOnSaveInstanceStateSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityInvokeOnSaveInstanceStateSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/ActivityInvokeOnSaveInstanceStateSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentExtensions.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentExtensions.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentExtensions.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentExtensions.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterHost.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterHost.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterHost.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterHost.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterSetupSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterSetupSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterSetupSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentFragmentRouterSetupSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentInvokeOnSaveInstanceStateSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentInvokeOnSaveInstanceStateSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentInvokeOnSaveInstanceStateSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentInvokeOnSaveInstanceStateSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterHost.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterHost.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterHost.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterHost.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterSetupSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterSetupSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterSetupSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/FragmentRouterSetupSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnHostSetupSyntaxInstance.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnHostSetupSyntaxInstance.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnHostSetupSyntaxInstance.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnHostSetupSyntaxInstance.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnSaveInstanceStateSyntax.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnSaveInstanceStateSyntax.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnSaveInstanceStateSyntax.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/InvokeOnSaveInstanceStateSyntax.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/fragment/setup/OnSaveInstanceStateCallback.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/OnSaveInstanceStateCallback.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/fragment/setup/OnSaveInstanceStateCallback.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/fragment/setup/OnSaveInstanceStateCallback.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/utils/Logging.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/utils/Logging.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/utils/Logging.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/utils/Logging.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/utils/isMainThread.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/utils/isMainThread.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/utils/isMainThread.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/utils/isMainThread.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/utils/mainThread.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/utils/mainThread.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/utils/mainThread.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/utils/mainThread.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/utils/mainThreadHandler.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/utils/mainThreadHandler.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/utils/mainThreadHandler.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/utils/mainThreadHandler.kt diff --git a/android/src/main/java/io/sellmair/kompass/android/utils/requireMainThread.kt b/kompass-android/src/main/java/io/sellmair/kompass/android/utils/requireMainThread.kt similarity index 100% rename from android/src/main/java/io/sellmair/kompass/android/utils/requireMainThread.kt rename to kompass-android/src/main/java/io/sellmair/kompass/android/utils/requireMainThread.kt diff --git a/core/build.gradle.kts b/kompass-core/build.gradle.kts similarity index 82% rename from core/build.gradle.kts rename to kompass-core/build.gradle.kts index d6a9eb8..f26af91 100644 --- a/core/build.gradle.kts +++ b/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/core/src/commonMain/kotlin/io/sellmair/kompass/core/Key.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Key.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/Key.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Key.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/MultiRouter.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/MultiRouter.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/MultiRouter.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/MultiRouter.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/Route.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Route.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/Route.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Route.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/Router.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Router.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/Router.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/Router.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/RouterInstruction.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RouterInstruction.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/RouterInstruction.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RouterInstruction.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStack.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStack.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStack.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStack.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackExtensions.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackExtensions.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackExtensions.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackExtensions.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntax.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntax.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntax.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntax.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/KompassException.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/KompassException.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/KompassException.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/KompassException.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/MissingRouteException.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/MissingRouteException.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/MissingRouteException.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/exception/MissingRouteException.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/ElementImpl.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/ElementImpl.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/ElementImpl.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/ElementImpl.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt diff --git a/core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/RoutingStackImpl.kt b/kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/RoutingStackImpl.kt similarity index 100% rename from core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/RoutingStackImpl.kt rename to kompass-core/src/commonMain/kotlin/io/sellmair/kompass/core/internal/RoutingStackImpl.kt diff --git a/core/src/commonTest/kotlin/io/sellmair/kompass/core/MultiRouterTest.kt b/kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/MultiRouterTest.kt similarity index 100% rename from core/src/commonTest/kotlin/io/sellmair/kompass/core/MultiRouterTest.kt rename to kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/MultiRouterTest.kt diff --git a/core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackElementTest.kt b/kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackElementTest.kt similarity index 100% rename from core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackElementTest.kt rename to kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackElementTest.kt diff --git a/core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntaxTest.kt b/kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntaxTest.kt similarity index 100% rename from core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntaxTest.kt rename to kompass-core/src/commonTest/kotlin/io/sellmair/kompass/core/RoutingStackInstructionSyntaxTest.kt diff --git a/core/src/jvmMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt b/kompass-core/src/jvmMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt similarity index 100% rename from core/src/jvmMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt rename to kompass-core/src/jvmMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt diff --git a/core/src/macosMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt b/kompass-core/src/macosMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt similarity index 100% rename from core/src/macosMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt rename to kompass-core/src/macosMain/kotlin/io/sellmair/kompass/core/internal/Lock.kt diff --git a/core/src/main/AndroidManifest.xml b/kompass-core/src/main/AndroidManifest.xml similarity index 100% rename from core/src/main/AndroidManifest.xml rename to kompass-core/src/main/AndroidManifest.xml diff --git a/settings.gradle b/settings.gradle index d26e17e..7f52cc0 100644 --- 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'