Updates

Author: cvb941

.gitignore

@@ -15,3 +15,5 @@ gradle-app.setting
 # gradle/wrapper/gradle-wrapper.properties
 
 .firebase
+
+node_modules/

.idea/codeStyles/Project.xml

@@ -1,19 +1,18 @@
 plugins {
-    kotlin("js") version "1.5.30"
+    kotlin("js") version "1.7.10"
 }
 
 group = "net.kusik"
-version = "1.1-SNAPSHOT"
+version = "1.2-SNAPSHOT"
 
 repositories {
-    jcenter()
     mavenCentral()
-    maven { url = uri("https://dl.bintray.com/kotlin/kotlinx") }
+    maven("https://maven.pkg.jetbrains.space/public/p/kotlinx-html/maven")
 }
 
 dependencies {
     testImplementation(kotlin("test-js"))
-    implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.3")
+    implementation("org.jetbrains.kotlinx:kotlinx-html-js:0.8.0")
 }
 
 kotlin {

.idea/compiler.xml

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

.idea/gradle.xml

@@ -366,12 +366,12 @@ object GradleKotlinConverter {
 
         // this will only catch id "..." version ..., should skip id("...")
         // should get the id "..."
-        val idExp = "id\\s*\".*?\"".toRegex()
+        val idExp = "(id)\\s*\"(.*?)\"".toRegex()
 
         return this.replace(idExp) {
             // remove the "id " before the real id
-            val idValue = it.value.replace("id\\s*".toRegex(), "")
-            "id($idValue)"
+            val (id, value) = it.destructured
+            """$id("$value")"""
         }
     }
 
@@ -381,13 +381,14 @@ object GradleKotlinConverter {
 // versionCode = 4
     fun String.addEquals(): String {
 
+        val compileSdk = "compileSdk"
         val signing = "keyAlias|keyPassword|storeFile|storePassword"
         val other = "multiDexEnabled|correctErrorTypes|javaMaxHeapSize|jumboMode|dimension|useSupportLibrary"
         val databinding = "dataBinding|viewBinding"
-        val defaultConfig = "applicationId|versionCode|versionName|testInstrumentationRunner"
+        val defaultConfig = "applicationId|minSdk|targetSdk|versionCode|versionName|testInstrumentationRunner"
         val negativeLookAhead = "(?!\\{)[^\\s]" // Don't want '{' as next word character
 
-        val versionExp = """($defaultConfig|$signing|$other|$databinding)\s*${negativeLookAhead}.*""".toRegex()
+        val versionExp = """($compileSdk|$defaultConfig|$signing|$other|$databinding)\s*${negativeLookAhead}.*""".toRegex()
 
         return this.replace(versionExp) {
             val split = it.value.split(" ")