Skip to content

Commit

Permalink
remove es target
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisjenx committed Jul 23, 2024
1 parent 04712c9 commit a54d7d1
Show file tree
Hide file tree
Showing 8 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion README.MD
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
val emailValidator = TextFieldValueValidator(
rules = listOf(Required, Email)
)
with(model.email) {
with(emailValiator) {
OutlinedTextField(
value = value,
onValueChange = ::validate,
Expand Down
1 change: 1 addition & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ plugins {
alias(libs.plugins.android.library).apply(false)
alias(libs.plugins.android.application) apply false
alias(libs.plugins.kotlin.android) apply false
alias(libs.plugins.maven.publish) apply false
}
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,4 @@ compose = { id = "org.jetbrains.compose", version.ref = "compose" }
android-library = { id = "com.android.library", version.ref = "agp" }
android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
maven-publish = { id = "com.vanniktech.maven.publish", version = "0.29.0" }
24 changes: 13 additions & 11 deletions library/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
import org.jetbrains.compose.ExperimentalComposeLibrary
import org.jetbrains.compose.desktop.application.dsl.TargetFormat
@file:OptIn(ExperimentalWasmDsl::class)

import com.android.build.api.dsl.ManagedVirtualDevice
import org.jetbrains.compose.ExperimentalComposeLibrary
import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinJsCompile
import org.jetbrains.kotlin.gradle.plugin.KotlinSourceSetTree
import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl

plugins {
alias(libs.plugins.multiplatform)
alias(libs.plugins.compose.compiler)
alias(libs.plugins.compose)
alias(libs.plugins.android.library)
alias(libs.plugins.maven.publish)
}

kotlin {
Expand Down Expand Up @@ -48,8 +50,13 @@ kotlin {
}

wasmJs {
browser()
//binaries.executable()
browser {
testTask {
useKarma {
useChromeHeadless()
}
}
}
}

listOf(
Expand Down Expand Up @@ -98,6 +105,7 @@ kotlin {
iosMain.dependencies {
}


}
}

Expand Down Expand Up @@ -134,9 +142,3 @@ android {
compose = true
}
}

tasks.withType<KotlinJsCompile>().configureEach {
kotlinOptions {
target = "es2015"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package com.chrisjenx.yakcov
import kotlin.contracts.ExperimentalContracts
import kotlin.contracts.contract

val emailRegex =
private val emailRegex =
"(?:[a-z0-9!#\$%&'*+/=?^_`{|}~-]+(?:\\.[a-z0-9!#\$%&'*+/=?^_`{|}~-]+)*|\"(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21\\x23-\\x5b\\x5d-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])*\")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\\x01-\\x08\\x0b\\x0c\\x0e-\\x1f\\x21-\\x5a\\x53-\\x7f]|\\\\[\\x01-\\x09\\x0b\\x0c\\x0e-\\x7f])+)])"
.toRegex(RegexOption.IGNORE_CASE)

Expand All @@ -18,4 +18,4 @@ fun String?.isEmail(): Boolean {
/**
* Check if is phone number to best ability of each platform.
*/
expect fun String?.isPhoneNumber(): Boolean
expect fun String?.isPhoneNumber(): Boolean
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ external class PhoneNumber {
fun isPossible(): Boolean
fun isValid(): Boolean
fun getType(): String
}
}

0 comments on commit a54d7d1

Please sign in to comment.