diff --git a/android/build.gradle b/android/build.gradle index 5f1a8dec..b1d70214 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -54,7 +54,6 @@ android { dependencies { embed project(':common') - embed project(':common-jvm') embed project(':common-android') embed project(':core') embed project(':event-bridge') diff --git a/build.gradle b/build.gradle index 477d0b5e..8f5486fb 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ buildscript { } -allprojects{ +allprojects { repositories { google() mavenCentral() @@ -33,7 +33,7 @@ allprojects{ } } - apply plugin: "org.jlleitschuh.gradle.ktlint" + //apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: 'org.jetbrains.dokka' group GROUP diff --git a/common-jvm/build.gradle b/common-jvm/build.gradle deleted file mode 100644 index 2f66ae18..00000000 --- a/common-jvm/build.gradle +++ /dev/null @@ -1,20 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -test { - useJUnitPlatform() -} - -dependencies { - api project(":common") - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation platform("org.junit:junit-bom:5.7.2") - testImplementation "org.junit.jupiter:junit-jupiter" -} diff --git a/common/build.gradle b/common/build.gradle deleted file mode 100644 index f6ffca39..00000000 --- a/common/build.gradle +++ /dev/null @@ -1,13 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" -} diff --git a/common/build.gradle.kts b/common/build.gradle.kts new file mode 100644 index 00000000..49fb847b --- /dev/null +++ b/common/build.gradle.kts @@ -0,0 +1,35 @@ +plugins { + kotlin("multiplatform") +} + +kotlin { + jvmToolchain(8) + jvm { + withJava() + testRuns.named("test") { + executionTask.configure { + useJUnitPlatform() + } + } + } + + sourceSets { + val commonMain by getting { + dependencies { + implementation(kotlin("stdlib-common")) + } + } + val jvmMain by getting { + dependencies { + implementation(kotlin("stdlib")) + } + } + val jvmTest by getting { + dependencies { + implementation(kotlin("test")) + implementation("org.junit.jupiter:junit-jupiter") + implementation("io.mockk:mockk:1.12.3") + } + } + } +} diff --git a/common/src/main/java/com/amplitude/common/ContextProvider.kt b/common/src/commonMain/kotlin/com/amplitude/common/ContextProvider.kt similarity index 100% rename from common/src/main/java/com/amplitude/common/ContextProvider.kt rename to common/src/commonMain/kotlin/com/amplitude/common/ContextProvider.kt diff --git a/common/src/main/java/com/amplitude/common/Logger.kt b/common/src/commonMain/kotlin/com/amplitude/common/Logger.kt similarity index 100% rename from common/src/main/java/com/amplitude/common/Logger.kt rename to common/src/commonMain/kotlin/com/amplitude/common/Logger.kt diff --git a/common-jvm/src/main/java/com/amplitude/common/jvm/ConsoleLogger.kt b/common/src/jvmMain/kotlin/com/amplitude/common/jvm/ConsoleLogger.kt similarity index 100% rename from common-jvm/src/main/java/com/amplitude/common/jvm/ConsoleLogger.kt rename to common/src/jvmMain/kotlin/com/amplitude/common/jvm/ConsoleLogger.kt diff --git a/common-jvm/src/test/kotlin/com/amplitude/common/jvm/ConsoleLoggerTest.kt b/common/src/jvmTest/kotlin/com/amplitude/common/jvm/ConsoleLoggerTest.kt similarity index 100% rename from common-jvm/src/test/kotlin/com/amplitude/common/jvm/ConsoleLoggerTest.kt rename to common/src/jvmTest/kotlin/com/amplitude/common/jvm/ConsoleLoggerTest.kt diff --git a/core/build.gradle b/core/build.gradle deleted file mode 100644 index 3f904eca..00000000 --- a/core/build.gradle +++ /dev/null @@ -1,43 +0,0 @@ -plugins { - id 'java' - id 'kotlin' - id 'org.jetbrains.kotlin.jvm' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} -group 'com.amplitude' - -repositories { - mavenCentral() -} - -test { - useJUnitPlatform() -} - -dependencies { - api project(":common") - api project(":common-jvm") - api project(":event-bridge") - api project(':id') - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - - // MAIN DEPS - compileOnly 'org.json:json:20211205' - implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2' - - testImplementation 'org.json:json:20211205' - testImplementation 'io.mockk:mockk:1.12.3' - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' - - testImplementation platform("org.junit:junit-bom:5.7.2") - testImplementation "org.junit.jupiter:junit-jupiter" - testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' -} - -tasks.dokkaHtmlPartial.configure { - failOnWarning.set(true) -} diff --git a/core/build.gradle.kts b/core/build.gradle.kts new file mode 100644 index 00000000..1af2f566 --- /dev/null +++ b/core/build.gradle.kts @@ -0,0 +1,50 @@ +plugins { + kotlin("multiplatform") +} + +group = "com.amplitude" + +repositories { + mavenCentral() +} + +kotlin { + jvmToolchain(8) + jvm { + withJava() + testRuns.named("test") { + executionTask.configure { + useJUnitPlatform() + } + } + } + + sourceSets { + val commonMain by getting { + dependencies { + api(project(":common")) + api(project(":event-bridge")) + api(project(":id")) + + implementation("org.json:json:20211205") + implementation("org.jetbrains.kotlin:kotlin-stdlib") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2") + } + } + + val jvmTest by getting { + dependencies { + implementation("io.mockk:mockk:1.12.3") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4") + + implementation(platform("org.junit:junit-bom:5.7.2")) + implementation("org.junit.jupiter:junit-jupiter") + implementation("com.squareup.okhttp3:mockwebserver:4.10.0") + } + } + } +} + +tasks.dokkaHtmlPartial.configure { + failOnWarning.set(true) +} diff --git a/core/src/main/java/com/amplitude/core/Amplitude.kt b/core/src/commonMain/kotlin/com/amplitude/core/Amplitude.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/Amplitude.kt rename to core/src/commonMain/kotlin/com/amplitude/core/Amplitude.kt diff --git a/core/src/main/java/com/amplitude/core/Configuration.kt b/core/src/commonMain/kotlin/com/amplitude/core/Configuration.kt similarity index 97% rename from core/src/main/java/com/amplitude/core/Configuration.kt rename to core/src/commonMain/kotlin/com/amplitude/core/Configuration.kt index 044ab534..784b4150 100644 --- a/core/src/main/java/com/amplitude/core/Configuration.kt +++ b/core/src/commonMain/kotlin/com/amplitude/core/Configuration.kt @@ -50,14 +50,14 @@ open class Configuration @JvmOverloads constructor( } private fun isMinIdLengthValid(): Boolean { - return minIdLength ?. let { + return minIdLength?.let { it > 0 } ?: let { true } } - internal fun getApiHost(): String { + fun getApiHost(): String { return this.serverUrl ?: with(this) { when { serverZone == ServerZone.EU && useBatch -> Constants.EU_BATCH_API_HOST diff --git a/core/src/main/java/com/amplitude/core/Constants.kt b/core/src/commonMain/kotlin/com/amplitude/core/Constants.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/Constants.kt rename to core/src/commonMain/kotlin/com/amplitude/core/Constants.kt diff --git a/core/src/main/java/com/amplitude/core/LoggerProvider.kt b/core/src/commonMain/kotlin/com/amplitude/core/LoggerProvider.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/LoggerProvider.kt rename to core/src/commonMain/kotlin/com/amplitude/core/LoggerProvider.kt diff --git a/core/src/main/java/com/amplitude/core/State.kt b/core/src/commonMain/kotlin/com/amplitude/core/State.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/State.kt rename to core/src/commonMain/kotlin/com/amplitude/core/State.kt diff --git a/core/src/main/java/com/amplitude/core/Storage.kt b/core/src/commonMain/kotlin/com/amplitude/core/Storage.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/Storage.kt rename to core/src/commonMain/kotlin/com/amplitude/core/Storage.kt diff --git a/core/src/main/java/com/amplitude/core/events/BaseEvent.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/BaseEvent.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/BaseEvent.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/BaseEvent.kt diff --git a/core/src/main/java/com/amplitude/core/events/EventOptions.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/EventOptions.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/EventOptions.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/EventOptions.kt diff --git a/core/src/main/java/com/amplitude/core/events/GroupIdentifyEvent.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/GroupIdentifyEvent.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/GroupIdentifyEvent.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/GroupIdentifyEvent.kt diff --git a/core/src/main/java/com/amplitude/core/events/Identify.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/Identify.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/Identify.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/Identify.kt diff --git a/core/src/main/java/com/amplitude/core/events/IdentifyEvent.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/IdentifyEvent.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/IdentifyEvent.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/IdentifyEvent.kt diff --git a/core/src/main/java/com/amplitude/core/events/IngestionMetadata.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/IngestionMetadata.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/IngestionMetadata.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/IngestionMetadata.kt diff --git a/core/src/main/java/com/amplitude/core/events/Plan.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/Plan.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/Plan.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/Plan.kt diff --git a/core/src/main/java/com/amplitude/core/events/Revenue.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/Revenue.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/Revenue.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/Revenue.kt diff --git a/core/src/main/java/com/amplitude/core/events/RevenueEvent.kt b/core/src/commonMain/kotlin/com/amplitude/core/events/RevenueEvent.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/events/RevenueEvent.kt rename to core/src/commonMain/kotlin/com/amplitude/core/events/RevenueEvent.kt diff --git a/core/src/main/java/com/amplitude/core/platform/EventPipeline.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/EventPipeline.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/EventPipeline.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/EventPipeline.kt diff --git a/core/src/main/java/com/amplitude/core/platform/Mediator.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/Mediator.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/Mediator.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/Mediator.kt diff --git a/core/src/main/java/com/amplitude/core/platform/Plugin.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/Plugin.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/Plugin.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/Plugin.kt diff --git a/core/src/main/java/com/amplitude/core/platform/Timeline.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/Timeline.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/Timeline.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/Timeline.kt diff --git a/core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptFileStorageHandler.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptFileStorageHandler.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptFileStorageHandler.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptFileStorageHandler.kt diff --git a/core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptInMemoryStorageHandler.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptInMemoryStorageHandler.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptInMemoryStorageHandler.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptInMemoryStorageHandler.kt diff --git a/core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptStorageHandler.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptStorageHandler.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptStorageHandler.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptStorageHandler.kt diff --git a/core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptor.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptor.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/intercept/IdentifyInterceptor.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/intercept/IdentifyInterceptor.kt diff --git a/core/src/main/java/com/amplitude/core/platform/plugins/AmplitudeDestination.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/AmplitudeDestination.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/plugins/AmplitudeDestination.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/AmplitudeDestination.kt diff --git a/core/src/main/java/com/amplitude/core/platform/plugins/ContextPlugin.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/ContextPlugin.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/plugins/ContextPlugin.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/ContextPlugin.kt diff --git a/core/src/main/java/com/amplitude/core/platform/plugins/GetAmpliExtrasPlugin.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPlugin.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/plugins/GetAmpliExtrasPlugin.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPlugin.kt diff --git a/core/src/main/java/com/amplitude/core/platform/plugins/IdentityEventSender.kt b/core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/IdentityEventSender.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/platform/plugins/IdentityEventSender.kt rename to core/src/commonMain/kotlin/com/amplitude/core/platform/plugins/IdentityEventSender.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/AnalyticsEventReceiver.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/AnalyticsEventReceiver.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/AnalyticsEventReceiver.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/AnalyticsEventReceiver.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/AnalyticsIdentityListener.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/AnalyticsIdentityListener.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/AnalyticsIdentityListener.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/AnalyticsIdentityListener.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/ConsoleLoggerProvider.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/ConsoleLoggerProvider.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/ConsoleLoggerProvider.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/ConsoleLoggerProvider.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/Diagnostics.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/Diagnostics.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/Diagnostics.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/Diagnostics.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/EventsFileManager.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/EventsFileManager.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/EventsFileManager.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/EventsFileManager.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/FileResponseHandler.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/FileResponseHandler.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/FileResponseHandler.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/FileResponseHandler.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/FileStorage.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/FileStorage.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/FileStorage.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/FileStorage.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/InMemoryResponseHandler.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/InMemoryResponseHandler.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/InMemoryResponseHandler.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/InMemoryResponseHandler.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/InMemoryStorage.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/InMemoryStorage.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/InMemoryStorage.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/InMemoryStorage.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/JSON.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/JSON.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/JSON.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/JSON.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/JSONUtil.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/JSONUtil.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/JSONUtil.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/JSONUtil.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/LoggerExtensions.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/LoggerExtensions.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/LoggerExtensions.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/LoggerExtensions.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/http/AnalyticsRequest.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/http/AnalyticsRequest.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/http/AnalyticsRequest.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/http/AnalyticsRequest.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/http/AnalyticsResponse.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/http/AnalyticsResponse.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/http/AnalyticsResponse.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/http/AnalyticsResponse.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/http/HttpClient.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/http/HttpClient.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/http/HttpClient.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/http/HttpClient.kt diff --git a/core/src/main/java/com/amplitude/core/utilities/http/HttpClientInterface.kt b/core/src/commonMain/kotlin/com/amplitude/core/utilities/http/HttpClientInterface.kt similarity index 100% rename from core/src/main/java/com/amplitude/core/utilities/http/HttpClientInterface.kt rename to core/src/commonMain/kotlin/com/amplitude/core/utilities/http/HttpClientInterface.kt diff --git a/core/src/test/kotlin/com/amplitude/core/AmplitudeTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/AmplitudeTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/AmplitudeTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/AmplitudeTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/ConfigurationTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/ConfigurationTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/ConfigurationTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/ConfigurationTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/IdentifyInterceptTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/IdentifyInterceptTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/IdentifyInterceptTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/IdentifyInterceptTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/events/BaseEventTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/events/BaseEventTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/events/BaseEventTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/events/BaseEventTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/events/IdentifyTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/events/IdentifyTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/events/IdentifyTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/events/IdentifyTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/events/IngestionMetadataTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/events/IngestionMetadataTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/events/IngestionMetadataTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/events/IngestionMetadataTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/events/PlanTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/events/PlanTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/events/PlanTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/events/PlanTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/events/RevenueTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/events/RevenueTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/events/RevenueTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/events/RevenueTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/platform/EventPipelineTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/platform/EventPipelineTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/platform/EventPipelineTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/platform/EventPipelineTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPluginTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPluginTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPluginTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/platform/plugins/GetAmpliExtrasPluginTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/ConsoleLoggerProviderTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/ConsoleLoggerProviderTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/ConsoleLoggerProviderTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/ConsoleLoggerProviderTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/DiagnosticsTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/DiagnosticsTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/DiagnosticsTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/DiagnosticsTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/EventsFileManagerTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/EventsFileManagerTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/EventsFileManagerTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/EventsFileManagerTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/FileResponseHandlerTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/FileResponseHandlerTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/FileResponseHandlerTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/FileResponseHandlerTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/HttpClientTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/HttpClientTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/HttpClientTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/HttpClientTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utilities/InMemoryResponseHandlerTest.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utilities/InMemoryResponseHandlerTest.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utilities/InMemoryResponseHandlerTest.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utilities/InMemoryResponseHandlerTest.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utils/Mocks.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utils/Mocks.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utils/Mocks.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utils/Mocks.kt diff --git a/core/src/test/kotlin/com/amplitude/core/utils/Plugins.kt b/core/src/jvmTest/kotlin/com/amplitude/core/utils/Plugins.kt similarity index 100% rename from core/src/test/kotlin/com/amplitude/core/utils/Plugins.kt rename to core/src/jvmTest/kotlin/com/amplitude/core/utils/Plugins.kt diff --git a/event-bridge/build.gradle b/event-bridge/build.gradle deleted file mode 100644 index 64afcd9c..00000000 --- a/event-bridge/build.gradle +++ /dev/null @@ -1,17 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} -test { - useJUnitPlatform() -} -dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation platform("org.junit:junit-bom:5.7.2") - testImplementation "org.junit.jupiter:junit-jupiter" -} diff --git a/event-bridge/build.gradle.kts b/event-bridge/build.gradle.kts new file mode 100644 index 00000000..748f58eb --- /dev/null +++ b/event-bridge/build.gradle.kts @@ -0,0 +1,30 @@ +plugins { + kotlin("multiplatform") +} + +kotlin { + jvmToolchain(8) + jvm { + withJava() + testRuns.named("test") { + executionTask.configure { + useJUnitPlatform() + } + } + } + + sourceSets { + val jvmMain by getting { + dependencies { + implementation(project(":common")) + implementation(kotlin("stdlib")) + } + } + val jvmTest by getting { + dependencies { + implementation(kotlin("test")) + implementation("org.junit.jupiter:junit-jupiter") + } + } + } +} diff --git a/event-bridge/src/main/java/com/amplitude/eventbridge/EventBridge.kt b/event-bridge/src/commonMain/kotlin/com/amplitude/eventbridge/EventBridge.kt similarity index 100% rename from event-bridge/src/main/java/com/amplitude/eventbridge/EventBridge.kt rename to event-bridge/src/commonMain/kotlin/com/amplitude/eventbridge/EventBridge.kt diff --git a/event-bridge/src/main/java/com/amplitude/eventbridge/EventBridgeContainer.kt b/event-bridge/src/commonMain/kotlin/com/amplitude/eventbridge/EventBridgeContainer.kt similarity index 100% rename from event-bridge/src/main/java/com/amplitude/eventbridge/EventBridgeContainer.kt rename to event-bridge/src/commonMain/kotlin/com/amplitude/eventbridge/EventBridgeContainer.kt diff --git a/event-bridge/src/test/kotlin/com/amplitude/eventbridge/EventBridgeContainerTest.kt b/event-bridge/src/jvmTest/kotlin/com/amplitude/eventbridge/EventBridgeContainerTest.kt similarity index 100% rename from event-bridge/src/test/kotlin/com/amplitude/eventbridge/EventBridgeContainerTest.kt rename to event-bridge/src/jvmTest/kotlin/com/amplitude/eventbridge/EventBridgeContainerTest.kt diff --git a/event-bridge/src/test/kotlin/com/amplitude/eventbridge/EventBridgeTest.kt b/event-bridge/src/jvmTest/kotlin/com/amplitude/eventbridge/EventBridgeTest.kt similarity index 100% rename from event-bridge/src/test/kotlin/com/amplitude/eventbridge/EventBridgeTest.kt rename to event-bridge/src/jvmTest/kotlin/com/amplitude/eventbridge/EventBridgeTest.kt diff --git a/id/build.gradle b/id/build.gradle deleted file mode 100644 index 64dbe5a9..00000000 --- a/id/build.gradle +++ /dev/null @@ -1,21 +0,0 @@ -plugins { - id 'java-library' - id 'kotlin' -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -test { - useJUnitPlatform() -} - -dependencies { - api project(":common") - implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" - testImplementation platform("org.junit:junit-bom:5.7.2") - testImplementation "org.junit.jupiter:junit-jupiter" - testImplementation 'io.mockk:mockk:1.12.3' -} diff --git a/id/build.gradle.kts b/id/build.gradle.kts new file mode 100644 index 00000000..29ba1478 --- /dev/null +++ b/id/build.gradle.kts @@ -0,0 +1,31 @@ +plugins { + kotlin("multiplatform") +} + +kotlin { + jvmToolchain(8) + jvm { + withJava() + testRuns.named("test") { + executionTask.configure { + useJUnitPlatform() + } + } + } + + sourceSets { + val jvmMain by getting { + dependencies { + implementation(project(":common")) + implementation(kotlin("stdlib")) + } + } + val jvmTest by getting { + dependencies { + implementation(kotlin("test")) + implementation("org.junit.jupiter:junit-jupiter") + implementation("io.mockk:mockk:1.12.3") + } + } + } +} diff --git a/id/src/main/java/com/amplitude/id/FileIdentityStorage.kt b/id/src/commonMain/kotlin/com/amplitude/id/FileIdentityStorage.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/FileIdentityStorage.kt rename to id/src/commonMain/kotlin/com/amplitude/id/FileIdentityStorage.kt diff --git a/id/src/main/java/com/amplitude/id/IMIdentityStorage.kt b/id/src/commonMain/kotlin/com/amplitude/id/IMIdentityStorage.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/IMIdentityStorage.kt rename to id/src/commonMain/kotlin/com/amplitude/id/IMIdentityStorage.kt diff --git a/id/src/main/java/com/amplitude/id/IdentityConfiguration.kt b/id/src/commonMain/kotlin/com/amplitude/id/IdentityConfiguration.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/IdentityConfiguration.kt rename to id/src/commonMain/kotlin/com/amplitude/id/IdentityConfiguration.kt diff --git a/id/src/main/java/com/amplitude/id/IdentityContainer.kt b/id/src/commonMain/kotlin/com/amplitude/id/IdentityContainer.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/IdentityContainer.kt rename to id/src/commonMain/kotlin/com/amplitude/id/IdentityContainer.kt diff --git a/id/src/main/java/com/amplitude/id/IdentityManager.kt b/id/src/commonMain/kotlin/com/amplitude/id/IdentityManager.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/IdentityManager.kt rename to id/src/commonMain/kotlin/com/amplitude/id/IdentityManager.kt diff --git a/id/src/main/java/com/amplitude/id/IdentityStorage.kt b/id/src/commonMain/kotlin/com/amplitude/id/IdentityStorage.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/IdentityStorage.kt rename to id/src/commonMain/kotlin/com/amplitude/id/IdentityStorage.kt diff --git a/id/src/main/java/com/amplitude/id/utilities/FileUtils.kt b/id/src/commonMain/kotlin/com/amplitude/id/utilities/FileUtils.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/utilities/FileUtils.kt rename to id/src/commonMain/kotlin/com/amplitude/id/utilities/FileUtils.kt diff --git a/id/src/main/java/com/amplitude/id/utilities/PropertiesFile.kt b/id/src/commonMain/kotlin/com/amplitude/id/utilities/PropertiesFile.kt similarity index 100% rename from id/src/main/java/com/amplitude/id/utilities/PropertiesFile.kt rename to id/src/commonMain/kotlin/com/amplitude/id/utilities/PropertiesFile.kt diff --git a/id/src/test/kotlin/com/amplitude/id/FileIdentityStorageTest.kt b/id/src/jvmTest/kotlin/com/amplitude/id/FileIdentityStorageTest.kt similarity index 100% rename from id/src/test/kotlin/com/amplitude/id/FileIdentityStorageTest.kt rename to id/src/jvmTest/kotlin/com/amplitude/id/FileIdentityStorageTest.kt diff --git a/id/src/test/kotlin/com/amplitude/id/IdentityContainerTest.kt b/id/src/jvmTest/kotlin/com/amplitude/id/IdentityContainerTest.kt similarity index 100% rename from id/src/test/kotlin/com/amplitude/id/IdentityContainerTest.kt rename to id/src/jvmTest/kotlin/com/amplitude/id/IdentityContainerTest.kt diff --git a/id/src/test/kotlin/com/amplitude/id/IdentityManagerTest.kt b/id/src/jvmTest/kotlin/com/amplitude/id/IdentityManagerTest.kt similarity index 100% rename from id/src/test/kotlin/com/amplitude/id/IdentityManagerTest.kt rename to id/src/jvmTest/kotlin/com/amplitude/id/IdentityManagerTest.kt diff --git a/id/src/test/kotlin/com/amplitude/id/utilities/PropertiesFileTest.kt b/id/src/jvmTest/kotlin/com/amplitude/id/utilities/PropertiesFileTest.kt similarity index 100% rename from id/src/test/kotlin/com/amplitude/id/utilities/PropertiesFileTest.kt rename to id/src/jvmTest/kotlin/com/amplitude/id/utilities/PropertiesFileTest.kt diff --git a/settings.gradle b/settings.gradle index c5c37485..e9b78608 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,8 +1,6 @@ rootProject.name = 'kotlin-sdk' include 'common' project(':common').projectDir = file('common') -include 'common-jvm' -project(':common-jvm').projectDir = file('common-jvm') include 'common-android' project(':common-android').projectDir = file('common-android') include 'core'