mirror of
https://github.com/InsanusMokrassar/KotlinPublicationScriptsBuilder.git
synced 2024-11-22 00:03:57 +00:00
updates
This commit is contained in:
parent
ac87a140cc
commit
c880d8e657
1
.gitignore
vendored
1
.gitignore
vendored
@ -10,3 +10,4 @@ build/
|
|||||||
out/
|
out/
|
||||||
|
|
||||||
local.properties
|
local.properties
|
||||||
|
kotlin-js-store/
|
||||||
|
@ -7,7 +7,7 @@ buildscript {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:4.2.2'
|
classpath 'com.android.tools.build:gradle:7.0.4'
|
||||||
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
|
||||||
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
|
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
|
||||||
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
|
classpath "com.getkeepsafe.dexcount:dexcount-gradle-plugin:$dexcount_version"
|
||||||
|
@ -10,7 +10,6 @@ kotlin {
|
|||||||
jvm {
|
jvm {
|
||||||
compilations.main.kotlinOptions {
|
compilations.main.kotlinOptions {
|
||||||
jvmTarget = "11"
|
jvmTarget = "11"
|
||||||
useIR = true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
sourceSets {
|
sourceSets {
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
package dev.inmo.kmppscriptbuilder.desktop
|
package dev.inmo.kmppscriptbuilder.desktop
|
||||||
|
|
||||||
import androidx.compose.desktop.Window
|
|
||||||
import androidx.compose.foundation.*
|
import androidx.compose.foundation.*
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.*
|
||||||
import androidx.compose.material.Colors
|
import androidx.compose.material.Colors
|
||||||
@ -8,6 +7,8 @@ import androidx.compose.material.MaterialTheme
|
|||||||
import androidx.compose.ui.Alignment
|
import androidx.compose.ui.Alignment
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.graphics.Color
|
import androidx.compose.ui.graphics.Color
|
||||||
|
import androidx.compose.ui.window.Window
|
||||||
|
import androidx.compose.ui.window.application
|
||||||
import dev.inmo.kmppscriptbuilder.desktop.utils.init
|
import dev.inmo.kmppscriptbuilder.desktop.utils.init
|
||||||
import dev.inmo.kmppscriptbuilder.desktop.utils.loadConfigFile
|
import dev.inmo.kmppscriptbuilder.desktop.utils.loadConfigFile
|
||||||
import dev.inmo.kmppscriptbuilder.desktop.views.BuilderView
|
import dev.inmo.kmppscriptbuilder.desktop.views.BuilderView
|
||||||
@ -16,7 +17,8 @@ import java.io.File
|
|||||||
//private val uncaughtExceptionsBC = BroadcastChannel<DefaultErrorHandler.ErrorEvent>(Channel.CONFLATED)
|
//private val uncaughtExceptionsBC = BroadcastChannel<DefaultErrorHandler.ErrorEvent>(Channel.CONFLATED)
|
||||||
//val uncaughtExceptionsFlow: Flow<DefaultErrorHandler.ErrorEvent> = uncaughtExceptionsBC.asFlow()
|
//val uncaughtExceptionsFlow: Flow<DefaultErrorHandler.ErrorEvent> = uncaughtExceptionsBC.asFlow()
|
||||||
|
|
||||||
fun main(args: Array<String>) = Window(title = "Kotlin Multiplatform Publishing Builder") {
|
fun main(args: Array<String>) = application {
|
||||||
|
Window(onCloseRequest = ::exitApplication, title = "Kotlin Multiplatform Publishing Builder") {
|
||||||
val builder = BuilderView()
|
val builder = BuilderView()
|
||||||
MaterialTheme(
|
MaterialTheme(
|
||||||
Colors(
|
Colors(
|
||||||
@ -62,3 +64,4 @@ fun main(args: Array<String>) = Window(title = "Kotlin Multiplatform Publishing
|
|||||||
builder.config = config
|
builder.config = config
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
@ -6,27 +6,27 @@ kotlin.incremental.js=true
|
|||||||
android.useAndroidX=true
|
android.useAndroidX=true
|
||||||
android.enableJetifier=true
|
android.enableJetifier=true
|
||||||
|
|
||||||
kotlin_version=1.5.21
|
kotlin_version=1.6.10
|
||||||
kotlin_coroutines_version=1.5.2
|
kotlin_coroutines_version=1.6.0
|
||||||
kotlin_serialisation_core_version=1.2.2
|
kotlin_serialisation_core_version=1.3.2
|
||||||
ktor_version=1.6.3
|
ktor_version=1.6.7
|
||||||
micro_utils_version=0.5.24
|
micro_utils_version=0.9.0
|
||||||
|
|
||||||
compose_version=1.0.0-alpha3
|
compose_version=1.0.1
|
||||||
|
|
||||||
# ANDROID
|
# ANDROID
|
||||||
|
|
||||||
android_minSdkVersion=21
|
android_minSdkVersion=21
|
||||||
android_compileSdkVersion=30
|
android_compileSdkVersion=32
|
||||||
android_buildToolsVersion=30.0.3
|
android_buildToolsVersion=32.0.0
|
||||||
dexcount_version=3.0.0
|
dexcount_version=3.0.1
|
||||||
junit_version=4.12
|
junit_version=4.12
|
||||||
test_ext_junit_version=1.1.2
|
test_ext_junit_version=1.1.2
|
||||||
espresso_core=3.3.0
|
espresso_core=3.3.0
|
||||||
|
|
||||||
# Dokka
|
# Dokka
|
||||||
|
|
||||||
dokka_version=1.5.0
|
dokka_version=1.6.0
|
||||||
|
|
||||||
# Project data
|
# Project data
|
||||||
|
|
||||||
|
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
|
|||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
|
||||||
|
@ -48,7 +48,7 @@ class LicensesView(
|
|||||||
emptyList()
|
emptyList()
|
||||||
} else {
|
} else {
|
||||||
licensesTemplates.filter {
|
licensesTemplates.filter {
|
||||||
val lowercasedTitle = it.title.toLowerCase()
|
val lowercasedTitle = it.title.lowercase()
|
||||||
lowercased.all { it in lowercasedTitle }
|
lowercased.all { it in lowercasedTitle }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -57,12 +57,12 @@ class LicensesView(
|
|||||||
}
|
}
|
||||||
private val searchElement = rootElement.createTextField("Quick add", "Type some license name part to find it").apply {
|
private val searchElement = rootElement.createTextField("Quick add", "Type some license name part to find it").apply {
|
||||||
oninput = {
|
oninput = {
|
||||||
changeActor.offer(Unit)
|
changeActor.trySend(Unit)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
private var searchString: String
|
private var searchString: String
|
||||||
get() = searchElement.value.toLowerCase()
|
get() = searchElement.value.lowercase()
|
||||||
set(value) {
|
set(value) {
|
||||||
searchElement.value = value
|
searchElement.value = value
|
||||||
}
|
}
|
||||||
@ -71,7 +71,7 @@ class LicensesView(
|
|||||||
createCommonButton(value.title).onclick = {
|
createCommonButton(value.title).onclick = {
|
||||||
searchString = ""
|
searchString = ""
|
||||||
licensesView.licenses += value
|
licensesView.licenses += value
|
||||||
changeActor.offer(Unit)
|
changeActor.trySend(Unit)
|
||||||
false
|
false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user