Get back some functional of "trying to update up to gradle wrapper 8.1.1"

crypto/build.gradle

@@ -21,11 +21,3 @@ kotlin {
         }
     }
 }
-
-android {
-    sourceSets {
-        main {
-            java.srcDirs += [ "src/jvmMain/kotlin" ]
-        }
-    }
-}

defaultAndroidSettings.gradle

@@ -1,6 +1,7 @@
 apply plugin: 'com.getkeepsafe.dexcount'
 
 android {
+    namespace "${group}.${project.name}"
     compileSdkVersion libs.versions.android.props.compileSdk.get().toInteger()
     buildToolsVersion libs.versions.android.props.buildTools.get()
 

dokka/build.gradle

@@ -13,10 +13,6 @@ repositories {
 
 kotlin {
     jvm()
-//    js(IR) {
-//        browser()
-//        nodejs()
-//    }
     android {}
 
     sourceSets {
@@ -38,22 +34,6 @@ kotlin {
                 }
             }
         }
-//        jsMain {
-//            dependencies {
-//                implementation kotlin('stdlib')
-
-//                project.parent.subprojects.forEach {
-//                    if (
-//                        it != project
-//                        && it.hasProperty("kotlin")
-//                        && it.kotlin.sourceSets.any { it.name.contains("commonMain") }
-//                        && it.kotlin.sourceSets.any { it.name.contains("jsMain") }
-//                    ) {
-//                        api it
-//                    }
-//                }
-//            }
-//        }
         jvmMain {
             dependencies {
                 implementation kotlin('stdlib')
@@ -116,10 +96,6 @@ tasks.dokkaHtml {
             sourceRoots.setFrom(findSourcesWithName("commonMain"))
         }
 
-//        named("jsMain") {
-//            sourceRoots.setFrom(findSourcesWithName("jsMain", "commonMain"))
-//        }
-
         named("jvmMain") {
             sourceRoots.setFrom(findSourcesWithName("jvmMain"))
         }

gradle.properties

@@ -3,6 +3,7 @@ org.gradle.parallel=true
 kotlin.js.generate.externals=true
 kotlin.incremental=true
 kotlin.incremental.js=true
+#kotlin.mpp.androidSourceSetLayoutVersion=2
 android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.jvmargs=-Xmx2g

gradle/libs.versions.toml

@@ -42,6 +42,9 @@ android-props-buildTools = "33.0.2"
 
 kt-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kt" }
 kt-reflect = { module = "org.jetbrains.kotlin:kotlin-reflect", version.ref = "kt" }
+kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" }
+kt-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kt" }
+kt-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kt" }
 
 kt-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kt-serialization" }
 kt-serialization-cbor = { module = "org.jetbrains.kotlinx:kotlinx-serialization-cbor", version.ref = "kt-serialization" }
@@ -85,10 +88,6 @@ android-fragment = { module = "androidx.fragment:fragment", version.ref = "andro
 android-espresso = { module = "androidx.test.espresso:espresso-core", version.ref = "android-espresso" }
 android-test-junit = { module = "androidx.test.ext:junit", version.ref = "android-test" }
 
-
-kt-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kt" }
-kt-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kt" }
-
 # ksp dependencies
 
 kotlin-poet = { module = "com.squareup:kotlinpoet-ksp", version.ref = "kotlin-poet" }

gradle/wrapper/gradle-wrapper.properties

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

jvm.publish.gradle

@@ -2,11 +2,13 @@ apply plugin: 'maven-publish'
 
 task javadocJar(type: Jar) {
     from javadoc
-    classifier = 'javadoc'
+    archiveClassifier.convention("javadoc")
+    archiveClassifier.set("javadoc")
 }
 task sourcesJar(type: Jar) {
     from sourceSets.main.allSource
-    classifier = 'sources'
+    archiveClassifier.convention("sources")
+    archiveClassifier.set("sources")
 }
 
 publishing {
@@ -30,29 +32,29 @@ publishing {
                 }
 
                 developers {
-                    
+
                         developer {
                             id = "InsanusMokrassar"
                             name = "Aleksei Ovsiannikov"
                             email = "ovsyannikov.alexey95@gmail.com"
                         }
-                    
+
 
                         developer {
                             id = "000Sanya"
                             name = "Syrov Aleksandr"
                             email = "000sanya.000sanya@gmail.com"
                         }
-                    
+
                 }
 
                 licenses {
-                    
+
                         license {
                             name = "Apache Software License 2.0"
                             url = "https://github.com/InsanusMokrassar/MicroUtils/blob/master/LICENSE"
                         }
-                    
+
                 }
             }
             repositories {
@@ -60,40 +62,40 @@ publishing {
                     maven {
                         name = "GithubPackages"
                         url = uri("https://maven.pkg.github.com/InsanusMokrassar/MicroUtils")
-                
+
                         credentials {
                             username = project.hasProperty('GITHUBPACKAGES_USER') ? project.property('GITHUBPACKAGES_USER') : System.getenv('GITHUBPACKAGES_USER')
                             password = project.hasProperty('GITHUBPACKAGES_PASSWORD') ? project.property('GITHUBPACKAGES_PASSWORD') : System.getenv('GITHUBPACKAGES_PASSWORD')
                         }
-                
+
                     }
                 }
                 if (project.hasProperty('GITEA_TOKEN') || System.getenv('GITEA_TOKEN') != null) {
                     maven {
                         name = "Gitea"
                         url = uri("https://git.inmo.dev/api/packages/InsanusMokrassar/maven")
-                
+
                         credentials(HttpHeaderCredentials) {
                             name = "Authorization"
                             value = project.hasProperty('GITEA_TOKEN') ? project.property('GITEA_TOKEN') : System.getenv('GITEA_TOKEN')
                         }
-                
+
                         authentication {
                             header(HttpHeaderAuthentication)
                         }
-                
+
                     }
                 }
                 if ((project.hasProperty('SONATYPE_USER') || System.getenv('SONATYPE_USER') != null) && (project.hasProperty('SONATYPE_PASSWORD') || System.getenv('SONATYPE_PASSWORD') != null)) {
                     maven {
                         name = "sonatype"
                         url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-                
+
                         credentials {
                             username = project.hasProperty('SONATYPE_USER') ? project.property('SONATYPE_USER') : System.getenv('SONATYPE_USER')
                             password = project.hasProperty('SONATYPE_PASSWORD') ? project.property('SONATYPE_PASSWORD') : System.getenv('SONATYPE_PASSWORD')
                         }
-                
+
                     }
                 }
             }
@@ -103,13 +105,13 @@ publishing {
 
 if (project.hasProperty("signing.gnupg.keyName")) {
     apply plugin: 'signing'
-    
+
     signing {
         useGpgCmd()
-    
+
         sign publishing.publications
     }
-    
+
     task signAll {
         tasks.withType(Sign).forEach {
             dependsOn(it)

koin/generator/build.gradle

@@ -13,3 +13,12 @@ dependencies {
     api libs.kotlin.poet
     api libs.ksp
 }
+
+kotlin {
+    jvmToolchain(8)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

language_codes/generator/build.gradle

@@ -25,6 +25,10 @@ dependencies {
 
 mainClassName="MainKt"
 
+kotlin {
+    jvmToolchain(8)
+}
+
 java {
     sourceCompatibility = JavaVersion.VERSION_1_8
     targetCompatibility = JavaVersion.VERSION_1_8

publish.gradle

@@ -1,7 +1,8 @@
 apply plugin: 'maven-publish'
 
 task javadocsJar(type: Jar) {
-    classifier = 'javadoc'
+    archiveClassifier.convention("javadoc")
+    archiveClassifier.set("javadoc")
 }
 
 publishing {

repos/generator/build.gradle

@@ -14,3 +14,12 @@ dependencies {
     api libs.kotlin.poet
     api libs.ksp
 }
+
+kotlin {
+    jvmToolchain(8)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}

settings.gradle

@@ -57,5 +57,3 @@ includes.each { originalName ->
     project.name = projectName
     project.projectDir = new File(projectDirectory)
 }
-
-enableFeaturePreview("VERSION_CATALOGS")