rewrite on multiplatform

.gitignore

@@ -8,3 +8,5 @@ settings.xml
 .gradle/
 build/
 out/
+
+local.properties

build.gradle

@@ -1,53 +1,31 @@
 buildscript {
+    repositories {
+        jcenter()
+        google()
+        mavenCentral()
+        mavenLocal()
+        maven { url "https://plugins.gradle.org/m2/" }
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.0.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
+        classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
+        classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
+    }
+}
+
+allprojects {
     repositories {
         mavenLocal()
         jcenter()
         mavenCentral()
-    }
+        google()
-
-    dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-    }
-}
-
-plugins {
-    id "org.jetbrains.kotlin.plugin.serialization" version "$kotlin_version"
-    id("org.jetbrains.compose") version "$compose_version"
-}
-
-apply plugin: 'kotlin'
-
-project.group = "com.insanusmokrassar"
-
-repositories {
-    mavenLocal()
-    jcenter()
-    mavenCentral()
         maven { url "https://kotlin.bintray.com/kotlinx" }
         maven { url "https://maven.pkg.jetbrains.space/public/p/compose/dev" }
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_runtime_version"
-    implementation "dev.inmo:micro_utils.coroutines:$micro_utils_version"
-    implementation(compose.desktop.currentOs)
-
-    implementation "io.ktor:ktor-client:$ktor_version"
-    implementation "io.ktor:ktor-client-cio:$ktor_version"
-}
-
-compose.desktop {
-    application {
-        mainClass = "com.insanusmokrassar.kmppscriptbuilder.BuilderKt"
     }
 }
 
-compileKotlin {
+apply from: "./extensions.gradle"
-    kotlinOptions {
+// apply from: "./github_release.gradle"
-        jvmTarget = "11"
-        useIR = true
-    }
-}

core/build.gradle

@@ -0,0 +1,20 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id "com.android.library"
+}
+
+apply from: "$mppProjectWithSerializationPresetPath"
+
+kotlin {
+    sourceSets {
+        commonMain {
+            dependencies {
+                api "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
+                api "dev.inmo:micro_utils.coroutines:$micro_utils_version"
+
+                api "io.ktor:ktor-client-core:$ktor_version"
+            }
+        }
+    }
+}

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/jvm_only/MavenTemplater.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.kmppscriptbuilder.export.jvm_only
+package dev.inmo.kmppscriptbuilder.core.export.jvm_only
 
-import com.insanusmokrassar.kmppscriptbuilder.models.*
+import dev.inmo.kmppscriptbuilder.core.models.*
 
 fun MavenConfig.buildJvmOnlyMavenConfig(licenses: List<License>): String = """
     apply plugin: 'maven-publish'

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/export/mpp/MavenTemplater.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.kmppscriptbuilder.export.mpp
+package dev.inmo.kmppscriptbuilder.core.export.mpp
 
-import com.insanusmokrassar.kmppscriptbuilder.models.*
+import dev.inmo.kmppscriptbuilder.core.models.*
 
 fun MavenConfig.buildMultiplatformMavenConfig(licenses: List<License>): String = """
     apply plugin: 'maven-publish'

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/models/Config.kt

@@ -1,7 +1,7 @@
-package com.insanusmokrassar.kmppscriptbuilder.models
+package dev.inmo.kmppscriptbuilder.core.models
 
-import com.insanusmokrassar.kmppscriptbuilder.export.jvm_only.buildJvmOnlyMavenConfig
+import dev.inmo.kmppscriptbuilder.core.export.jvm_only.buildJvmOnlyMavenConfig
-import com.insanusmokrassar.kmppscriptbuilder.export.mpp.buildMultiplatformMavenConfig
+import dev.inmo.kmppscriptbuilder.core.export.mpp.buildMultiplatformMavenConfig
 import kotlinx.serialization.*
 import kotlinx.serialization.builtins.serializer
 import kotlinx.serialization.descriptors.SerialDescriptor
@@ -16,7 +16,7 @@ sealed class ProjectType {
 }
 
 @Serializer(ProjectType::class)
-internal object ProjectTypeSerializer : KSerializer<ProjectType> {
+object ProjectTypeSerializer : KSerializer<ProjectType> {
     override val descriptor: SerialDescriptor = String.serializer().descriptor
     override fun deserialize(decoder: Decoder): ProjectType {
         return when (decoder.decodeString()) {

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/models/Developer.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.models
+package dev.inmo.kmppscriptbuilder.core.models
 
 import kotlinx.serialization.Serializable
 

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/models/License.kt

@@ -1,6 +1,6 @@
-package com.insanusmokrassar.kmppscriptbuilder.models
+package dev.inmo.kmppscriptbuilder.core.models
 
-import com.insanusmokrassar.kmppscriptbuilder.utils.serialFormat
+import dev.inmo.kmppscriptbuilder.core.utils.serialFormat
 import io.ktor.client.HttpClient
 import io.ktor.client.request.get
 import io.ktor.client.request.url

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/models/MavenConfig.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.models
+package dev.inmo.kmppscriptbuilder.core.models
 
 import kotlinx.serialization.Serializable
 

core/src/commonMain/kotlin/dev/inmo/kmppscriptbuilder/core/utils/SerialFormat.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.utils
+package dev.inmo.kmppscriptbuilder.core.utils
 
 import kotlinx.serialization.json.Json
 

core/src/main/AndroidManifest.xml

@@ -0,0 +1 @@
+<manifest package="dev.inmo.KotlinPublicationScriptsBuilder.core"/>

defaultAndroidSettings.gradle

@@ -0,0 +1,40 @@
+apply plugin: 'com.getkeepsafe.dexcount'
+
+android {
+    compileSdkVersion "$android_compileSdkVersion".toInteger()
+    buildToolsVersion "$android_buildToolsVersion"
+
+    defaultConfig {
+        minSdkVersion "$android_minSdkVersion".toInteger()
+        targetSdkVersion "$android_compileSdkVersion".toInteger()
+        versionCode "${android_code_version}".toInteger()
+        versionName "$version"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+        debug {
+            debuggable true
+        }
+    }
+
+    packagingOptions {
+        exclude 'META-INF/kotlinx-serialization-runtime.kotlin_module'
+        exclude 'META-INF/kotlinx-serialization-cbor.kotlin_module'
+        exclude 'META-INF/kotlinx-serialization-properties.kotlin_module'
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_1_8.toString()
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+}

desktop/build.gradle

@@ -0,0 +1,37 @@
+plugins {
+    id "org.jetbrains.kotlin.multiplatform"
+    id "org.jetbrains.kotlin.plugin.serialization"
+    id("org.jetbrains.compose") version "$compose_version"
+}
+
+apply from: "$mppJavaProjectPresetPath"
+
+kotlin {
+    jvm {
+        compilations.main.kotlinOptions {
+            jvmTarget = "11"
+            useIR = true
+        }
+    }
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation project(":kmppscriptbuilder.core")
+            }
+        }
+
+        jvmMain {
+            dependencies {
+                implementation(compose.desktop.currentOs)
+                api "io.ktor:ktor-client-cio:$ktor_version"
+            }
+        }
+    }
+}
+
+compose.desktop {
+    application {
+        mainClass = "dev.inmo.kmppscriptbuilder.desktop.BuilderKt"
+    }
+}
+

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/Builder.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder
+package dev.inmo.kmppscriptbuilder.desktop
 
 import androidx.compose.desktop.Window
 import androidx.compose.foundation.*
@@ -7,8 +7,8 @@ import androidx.compose.material.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
-import com.insanusmokrassar.kmppscriptbuilder.views.*
+import dev.inmo.kmppscriptbuilder.desktop.views.*
 import java.io.File
 
 //private val uncaughtExceptionsBC = BroadcastChannel<DefaultErrorHandler.ErrorEvent>(Channel.CONFLATED)

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/utils/FilesHandling.kt

@@ -1,6 +1,7 @@
-package com.insanusmokrassar.kmppscriptbuilder.utils
+package dev.inmo.kmppscriptbuilder.desktop.utils
 
-import com.insanusmokrassar.kmppscriptbuilder.models.Config
+import dev.inmo.kmppscriptbuilder.core.models.Config
+import dev.inmo.kmppscriptbuilder.core.utils.serialFormat
 import java.io.File
 import javax.swing.JFileChooser
 

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/utils/NewFileFilterFactory.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.utils
+package dev.inmo.kmppscriptbuilder.desktop.utils
 
 import java.io.File
 import javax.swing.filechooser.FileFilter

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/utils/UIElements.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.utils
+package dev.inmo.kmppscriptbuilder.desktop.utils
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/utils/View.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.utils
+package dev.inmo.kmppscriptbuilder.desktop.utils
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/BuilderView.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.clickable
@@ -8,8 +8,8 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.svgResource
 import androidx.compose.ui.unit.dp
-import com.insanusmokrassar.kmppscriptbuilder.models.Config
+import dev.inmo.kmppscriptbuilder.core.models.Config
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
 
 class BuilderView : View() {
     private val projectTypeView = ProjectTypeView()

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/DevelopersView.kt

@@ -1,8 +1,8 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.runtime.*
-import com.insanusmokrassar.kmppscriptbuilder.models.Developer
+import dev.inmo.kmppscriptbuilder.core.models.Developer
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
 
 class DeveloperState(
     id: String = "",

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/LicensesView.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
@@ -7,9 +7,9 @@ import androidx.compose.material.Divider
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.insanusmokrassar.kmppscriptbuilder.models.License
+import dev.inmo.kmppscriptbuilder.core.models.License
-import com.insanusmokrassar.kmppscriptbuilder.models.getLicenses
+import dev.inmo.kmppscriptbuilder.core.models.getLicenses
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
 import io.ktor.client.HttpClient
 import kotlinx.coroutines.*
 

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/ListView.kt

@@ -1,12 +1,11 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.*
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.insanusmokrassar.kmppscriptbuilder.models.Developer
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
 
 abstract class ListView<T>(title: String) : VerticalView(title) {
     protected val itemsList = mutableStateListOf<T>()

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/MavenInfoView.kt

@@ -1,10 +1,10 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.runtime.*
-import com.insanusmokrassar.kmppscriptbuilder.models.MavenConfig
+import dev.inmo.kmppscriptbuilder.core.models.MavenConfig
-import com.insanusmokrassar.kmppscriptbuilder.models.SonatypeRepository
+import dev.inmo.kmppscriptbuilder.core.models.SonatypeRepository
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
 
 class MavenInfoView : VerticalView("Project information") {
     private var projectNameProperty by mutableStateOf("")

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/ProjectTypeView.kt

@@ -1,4 +1,4 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Switch
@@ -6,8 +6,8 @@ import androidx.compose.material.Text
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.insanusmokrassar.kmppscriptbuilder.models.*
+import dev.inmo.kmppscriptbuilder.core.models.*
-import com.insanusmokrassar.kmppscriptbuilder.utils.VerticalView
+import dev.inmo.kmppscriptbuilder.desktop.utils.VerticalView
 
 class ProjectTypeView : VerticalView("Project type") {
     private var projectTypeState by mutableStateOf<Boolean>(false)

desktop/src/jvmMain/kotlin/dev/inmo/kmppscriptbuilder/desktop/views/RepositoriesView.kt

@@ -1,8 +1,8 @@
-package com.insanusmokrassar.kmppscriptbuilder.views
+package dev.inmo.kmppscriptbuilder.desktop.views
 
 import androidx.compose.runtime.*
-import com.insanusmokrassar.kmppscriptbuilder.models.MavenPublishingRepository
+import dev.inmo.kmppscriptbuilder.core.models.MavenPublishingRepository
-import com.insanusmokrassar.kmppscriptbuilder.utils.*
+import dev.inmo.kmppscriptbuilder.desktop.utils.*
 
 class RepositoryState(
     name: String = "",

extensions.gradle

@@ -0,0 +1,24 @@
+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"
+        mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle"
+
+        defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle"
+
+        // publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle"
+    }
+}

gradle.properties

@@ -1,10 +1,35 @@
+kotlin.code.style=official
+org.gradle.parallel=true
+kotlin.js.generate.externals=true
+kotlin.incremental=true
+kotlin.incremental.js=true
+android.useAndroidX=true
+android.enableJetifier=true
+
 kotlin_version=1.4.30
 kotlin_coroutines_version=1.4.2
-kotlin_serialisation_runtime_version=1.1.0
+kotlin_serialisation_core_version=1.1.0
-#tornadofx_version=1.7.20
 ktor_version=1.5.1
-micro_utils_version=0.4.25
+micro_utils_version=0.4.27
-
-javafxplugin_version=0.0.9
 
 compose_version=0.3.0
+
+# ANDROID
+
+android_minSdkVersion=21
+android_compileSdkVersion=30
+android_buildToolsVersion=30.0.2
+dexcount_version=2.0.0
+junit_version=4.12
+test_ext_junit_version=1.1.2
+espresso_core=3.3.0
+
+# Dokka
+
+dokka_version=1.4.20
+
+# Project data
+
+group=dev.inmo
+version=0.0.1
+android_code_version=1

mppAndroidProject.gradle

@@ -0,0 +1,26 @@
+project.version = "$version" + System.getenv("additional_version")
+project.group = "$group"
+
+// apply from: "$publishGradlePath"
+
+kotlin {
+    android {
+        publishAllLibraryVariants()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
+    }
+}
+
+apply from: "$defaultAndroidSettingsPresetPath"

mppJavaProject.gradle

@@ -0,0 +1,30 @@
+project.version = "$version" + System.getenv("additional_version")
+project.group = "$group"
+
+// apply from: "$publishGradlePath"
+
+kotlin {
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
+
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+    }
+}

mppProjectWithSerialization.gradle

@@ -0,0 +1,52 @@
+project.version = "$version" + System.getenv("additional_version")
+project.group = "$group"
+
+// apply from: "$publishGradlePath"
+
+kotlin {
+    jvm {
+        compilations.main.kotlinOptions.useIR = true
+    }
+    js (IR) {
+        browser()
+        nodejs()
+    }
+    android {
+        publishAllLibraryVariants()
+    }
+
+    sourceSets {
+        commonMain {
+            dependencies {
+                implementation kotlin('stdlib')
+                api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
+            }
+        }
+        commonTest {
+            dependencies {
+                implementation kotlin('test-common')
+                implementation kotlin('test-annotations-common')
+            }
+        }
+        jvmTest {
+            dependencies {
+                implementation kotlin('test-junit')
+            }
+        }
+        jsTest {
+            dependencies {
+                implementation kotlin('test-js')
+                implementation kotlin('test-junit')
+            }
+        }
+        androidTest {
+            dependencies {
+                implementation kotlin('test-junit')
+                implementation "androidx.test.ext:junit:$test_ext_junit_version"
+                implementation "androidx.test.espresso:espresso-core:$espresso_core"
+            }
+        }
+    }
+}
+
+apply from: "$defaultAndroidSettingsPresetPath"

settings.gradle

@@ -5,4 +5,21 @@ pluginManagement {
     }
 }
 
-rootProject.name = 'KotlinPublicationScriptsBuilder'
+rootProject.name = 'kmppscriptbuilder'
+
+String[] includes = [
+        ":core",
+        ":desktop"
+]
+
+
+includes.each { originalName ->
+    String projectDirectory = "${rootProject.projectDir.getAbsolutePath()}${originalName.replaceAll(":", File.separator)}"
+    String projectName = "${rootProject.name}${originalName.replaceAll(":", ".")}"
+    String projectIdentifier = ":${projectName}"
+    include projectIdentifier
+    ProjectDescriptor project = project(projectIdentifier)
+    project.name = projectName
+    project.projectDir = new File(projectDirectory)
+}
+

src/main/kotlin/com/insanusmokrassar/kmppscriptbuilder/models/BintrayConfig.kt

@@ -1,13 +0,0 @@
-package com.insanusmokrassar.kmppscriptbuilder.models
-
-import kotlinx.serialization.Serializable
-
-@Serializable
-data class BintrayConfig(
-    val repoUser: String = "\${project.hasProperty('BINTRAY_USER') ? project.property('BINTRAY_USER') : System.getenv('BINTRAY_USER')}",
-    val repo: String,
-    val packageName: String,
-    val packageVcs: String,
-    val autoPublish: Boolean = false,
-    val overridePublish: Boolean = false
-)