diff --git a/build.gradle b/build.gradle index 36c0e25..6f8a775 100644 --- a/build.gradle +++ b/build.gradle @@ -10,18 +10,76 @@ buildscript { classpath libs.android.tools.build classpath libs.android.dexcount classpath libs.kotlin.gradle.plugin - classpath libs.kotlin.serialization.plugin classpath libs.kotlin.dokka.plugin } } -allprojects { - repositories { - mavenLocal() - mavenCentral() - google() + +plugins { + alias(libs.plugins.kotlin.multiplatform) + alias(libs.plugins.kotlin.dokka) +} + +apply plugin: "com.android.library" + +project.version = "$version" +project.group = "$group" + +repositories { + mavenLocal() + mavenCentral() + google() +} + +kotlin { + jvm() + js (IR) { + browser() + nodejs() + } + android { + publishAllLibraryVariants() + } + + sourceSets { + commonMain { + dependencies { + implementation libs.kotlin + } + } + commonTest { + dependencies { + implementation libs.kotlin.test.common + implementation libs.kotlin.test.annotations.common + } + } + jvmTest { + dependencies { + implementation libs.kotlin.test.junit + } + } + jsTest { + dependencies { + implementation libs.kotlin.test.js + implementation libs.kotlin.test.junit + } + } + androidTest { + dependencies { + implementation libs.kotlin.test.junit + implementation libs.android.test.junit + implementation libs.android.test.espresso.core + } + } } } -apply from: "./extensions.gradle" +java { + toolchain { + languageVersion = JavaLanguageVersion.of(8) + } +} + +apply from: "defaultAndroidSettings.gradle" + // apply from: "./github_release.gradle" diff --git a/extensions.gradle b/extensions.gradle deleted file mode 100644 index 2e89947..0000000 --- a/extensions.gradle +++ /dev/null @@ -1,25 +0,0 @@ -allprojects { - ext { - projectByName = { String name -> - for (subproject in rootProject.subprojects) { - if (subproject.name == name) { - return subproject - } - } - return null - } - - internalProject = { String name -> - projectByName(name) - } - - mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" - mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" - mppJsProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJsProject.gradle" - mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" - - defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" - - // publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" - } -} diff --git a/gradle.properties b/gradle.properties index cd06544..31a7499 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,6 +8,6 @@ android.enableJetifier=true # Project data -group=dev.akkihi +group=dev.inmo version=0.0.1 android_code_version=1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 722af4f..1fe57c6 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,6 @@ [versions] kotlin = "1.6.21" -kotlin-serialization = "1.3.3" kotlin-gradle-plugin = "7.0.4" dexcount = "3.1.0" @@ -16,7 +15,6 @@ android-buildTools = "32.0.0" [libraries] kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" } -kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" } kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" } kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" } kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } @@ -29,10 +27,9 @@ android-test-espresso-core = { module = "androidx.test.espresso:espresso-core", android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "kotlin-gradle-plugin" } android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" } kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } -kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" } kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" } [plugins] kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } -kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } +kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "kotlin" } diff --git a/logger/build.gradle b/logger/build.gradle deleted file mode 100644 index 8a22926..0000000 --- a/logger/build.gradle +++ /dev/null @@ -1,8 +0,0 @@ -plugins { - id "org.jetbrains.kotlin.multiplatform" - id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" -} - -apply from: "$mppProjectWithSerializationPresetPath" - diff --git a/logger/src/main/AndroidManifest.xml b/logger/src/main/AndroidManifest.xml deleted file mode 100644 index 8c316c2..0000000 --- a/logger/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle deleted file mode 100644 index ad4e0d9..0000000 --- a/mppAndroidProject.gradle +++ /dev/null @@ -1,34 +0,0 @@ -project.version = "$version" -project.group = "$group" - -// apply from: "$publishGradlePath" - -kotlin { - android { - publishAllLibraryVariants() - } - - sourceSets { - commonMain { - dependencies { - implementation libs.kotlin - api libs.kotlin.serialization - } - } - commonTest { - dependencies { - implementation libs.kotlin.test.common - implementation libs.kotlin.test.annotations.common - } - } - androidTest { - dependencies { - implementation libs.kotlin.test.junit - implementation libs.android.test.junit - implementation libs.android.test.espresso.core - } - } - } -} - -apply from: "$defaultAndroidSettingsPresetPath" diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle deleted file mode 100644 index 22a767c..0000000 --- a/mppJavaProject.gradle +++ /dev/null @@ -1,34 +0,0 @@ -project.version = "$version" -project.group = "$group" - -// apply from: "$publishGradlePath" - -kotlin { - jvm() - - sourceSets { - commonMain { - dependencies { - implementation libs.kotlin - api libs.kotlin.serialization - } - } - commonTest { - dependencies { - implementation libs.kotlin.test.common - implementation libs.kotlin.test.annotations.common - } - } - jvmTest { - dependencies { - implementation libs.kotlin.test.junit - } - } - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} diff --git a/mppJsProject.gradle b/mppJsProject.gradle deleted file mode 100644 index 9f27e75..0000000 --- a/mppJsProject.gradle +++ /dev/null @@ -1,32 +0,0 @@ -project.version = "$version" -project.group = "$group" - -// apply from: "$publishGradlePath" - -kotlin { - js (IR) { - browser() - nodejs() - } - - sourceSets { - commonMain { - dependencies { - implementation libs.kotlin - api libs.kotlin.serialization - } - } - commonTest { - dependencies { - implementation libs.kotlin.test.common - implementation libs.kotlin.test.annotations.common - } - } - jsTest { - dependencies { - implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit - } - } - } -} diff --git a/mppProjectWithSerialization.gradle b/mppProjectWithSerialization.gradle deleted file mode 100644 index a60b395..0000000 --- a/mppProjectWithSerialization.gradle +++ /dev/null @@ -1,56 +0,0 @@ -project.version = "$version" -project.group = "$group" - -// apply from: "$publishGradlePath" - -kotlin { - jvm() - js (IR) { - browser() - nodejs() - } - android { - publishAllLibraryVariants() - } - - sourceSets { - commonMain { - dependencies { - implementation libs.kotlin - api libs.kotlin.serialization - } - } - commonTest { - dependencies { - implementation libs.kotlin.test.common - implementation libs.kotlin.test.annotations.common - } - } - jvmTest { - dependencies { - implementation libs.kotlin.test.junit - } - } - jsTest { - dependencies { - implementation libs.kotlin.test.js - implementation libs.kotlin.test.junit - } - } - androidTest { - dependencies { - implementation libs.kotlin.test.junit - implementation libs.android.test.junit - implementation libs.android.test.espresso.core - } - } - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(8) - } -} - -apply from: "$defaultAndroidSettingsPresetPath" diff --git a/settings.gradle b/settings.gradle index baf3abb..af6ae15 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,18 +1,3 @@ -rootProject.name = 'truth_simple_kmp_logger' - -String[] includes = [ - ":logger" -] - - -includes.each { originalName -> - String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replace(":", File.separator)}" - String projectName = "${rootProject.name}${originalName.replace(":", ".")}" - String projectIdentifier = ":${projectName}" - include projectIdentifier - ProjectDescriptor project = project(projectIdentifier) - project.name = projectName - project.projectDir = new File(projectDirectory) -} +rootProject.name = 'kslog' enableFeaturePreview("VERSION_CATALOGS") diff --git a/logger/src/commonMain/kotlin/Logger.kt b/src/commonMain/kotlin/Logger.kt similarity index 96% rename from logger/src/commonMain/kotlin/Logger.kt rename to src/commonMain/kotlin/Logger.kt index 2359fed..e986e45 100644 --- a/logger/src/commonMain/kotlin/Logger.kt +++ b/src/commonMain/kotlin/Logger.kt @@ -1,4 +1,4 @@ -package truth.simple.kmp.logger.common +package dev.inmo.kslog.common enum class LogLevel { diff --git a/logger/src/jsMain/kotlin/ActualLogger.kt b/src/jsMain/kotlin/ActualLogger.kt similarity index 95% rename from logger/src/jsMain/kotlin/ActualLogger.kt rename to src/jsMain/kotlin/ActualLogger.kt index 5e4497f..358e16d 100644 --- a/logger/src/jsMain/kotlin/ActualLogger.kt +++ b/src/jsMain/kotlin/ActualLogger.kt @@ -1,4 +1,4 @@ -package truth.simple.kmp.logger.common +package dev.inmo.kslog.common fun Logger( messageFormatter: (l: LogLevel, m: String, t: String?, Throwable?) -> String, @@ -25,4 +25,4 @@ actual fun Logger( { l, m, t, e -> "[$l] ${t ?: defaultTag} - $m" }, { l, m, t, e -> filter(l, m, t ?: defaultTag, e) } ) -} \ No newline at end of file +} diff --git a/logger/src/jvmMain/kotlin/ActualLogger.kt b/src/jvmMain/kotlin/ActualLogger.kt similarity index 95% rename from logger/src/jvmMain/kotlin/ActualLogger.kt rename to src/jvmMain/kotlin/ActualLogger.kt index f471eab..e404cd3 100644 --- a/logger/src/jvmMain/kotlin/ActualLogger.kt +++ b/src/jvmMain/kotlin/ActualLogger.kt @@ -1,4 +1,4 @@ -package truth.simple.kmp.logger.common +package dev.inmo.kslog.common import java.util.logging.Level @@ -23,4 +23,4 @@ actual fun Logger( e ) } -} \ No newline at end of file +} diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml new file mode 100644 index 0000000..98dddc5 --- /dev/null +++ b/src/main/AndroidManifest.xml @@ -0,0 +1 @@ + diff --git a/logger/src/main/kotlin/ActualLogger.kt b/src/main/kotlin/ActualLogger.kt similarity index 93% rename from logger/src/main/kotlin/ActualLogger.kt rename to src/main/kotlin/ActualLogger.kt index ec2bed2..67d1e0d 100644 --- a/logger/src/main/kotlin/ActualLogger.kt +++ b/src/main/kotlin/ActualLogger.kt @@ -1,4 +1,4 @@ -package truth.simple.kmp.logger.common +package dev.inmo.kslog.common import android.util.Log @@ -18,4 +18,4 @@ actual fun Logger( LogLevel.DEBUG -> Log.d(tag, m, e) } } -} \ No newline at end of file +}