diff --git a/build.gradle b/build.gradle index a2d3838..4dc9d52 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,8 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' 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" } } diff --git a/cache/admins/common/build.gradle b/cache/admins/common/build.gradle index 05af6c2..ab046fd 100644 --- a/cache/admins/common/build.gradle +++ b/cache/admins/common/build.gradle @@ -1,10 +1,9 @@ plugins { id "org.jetbrains.kotlin.multiplatform" id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaWithJsProjectPath" kotlin { sourceSets { diff --git a/cache/admins/common/src/main/AndroidManifest.xml b/cache/admins/common/src/main/AndroidManifest.xml deleted file mode 100644 index fe0367f..0000000 --- a/cache/admins/common/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cache/admins/micro_utils/build.gradle b/cache/admins/micro_utils/build.gradle index d5e74fc..0c1a0a5 100644 --- a/cache/admins/micro_utils/build.gradle +++ b/cache/admins/micro_utils/build.gradle @@ -1,10 +1,9 @@ plugins { id "org.jetbrains.kotlin.multiplatform" id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaWithJsProjectPath" kotlin { sourceSets { diff --git a/cache/admins/micro_utils/src/main/AndroidManifest.xml b/cache/admins/micro_utils/src/main/AndroidManifest.xml deleted file mode 100644 index 589f648..0000000 --- a/cache/admins/micro_utils/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cache/admins/plagubot/build.gradle b/cache/admins/plagubot/build.gradle index a00b9ab..80378d7 100644 --- a/cache/admins/plagubot/build.gradle +++ b/cache/admins/plagubot/build.gradle @@ -1,10 +1,9 @@ plugins { id "org.jetbrains.kotlin.multiplatform" id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaWithJsProjectPath" kotlin { sourceSets { diff --git a/cache/admins/plagubot/src/main/AndroidManifest.xml b/cache/admins/plagubot/src/main/AndroidManifest.xml deleted file mode 100644 index ae32650..0000000 --- a/cache/admins/plagubot/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cache/content/common/build.gradle b/cache/content/common/build.gradle index 1c05fde..9a85f4f 100644 --- a/cache/content/common/build.gradle +++ b/cache/content/common/build.gradle @@ -1,10 +1,9 @@ plugins { id "org.jetbrains.kotlin.multiplatform" id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaWithJsProjectPath" kotlin { sourceSets { diff --git a/cache/content/common/src/main/AndroidManifest.xml b/cache/content/common/src/main/AndroidManifest.xml deleted file mode 100644 index e663aab..0000000 --- a/cache/content/common/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cache/content/micro_utils/build.gradle b/cache/content/micro_utils/build.gradle index 0dcdc86..36e632d 100644 --- a/cache/content/micro_utils/build.gradle +++ b/cache/content/micro_utils/build.gradle @@ -1,10 +1,9 @@ plugins { id "org.jetbrains.kotlin.multiplatform" id "org.jetbrains.kotlin.plugin.serialization" - id "com.android.library" } -apply from: "$mppProjectWithSerializationPresetPath" +apply from: "$mppJavaWithJsProjectPath" kotlin { sourceSets { diff --git a/cache/content/micro_utils/src/main/AndroidManifest.xml b/cache/content/micro_utils/src/main/AndroidManifest.xml deleted file mode 100644 index 77c705e..0000000 --- a/cache/content/micro_utils/src/main/AndroidManifest.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/defaultAndroidSettings.gradle b/defaultAndroidSettings.gradle deleted file mode 100644 index 79f821a..0000000 --- a/defaultAndroidSettings.gradle +++ /dev/null @@ -1,40 +0,0 @@ -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' - } -} diff --git a/extensions.gradle b/extensions.gradle index f686575..4141eba 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,11 +13,7 @@ allprojects { 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" + mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle" publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" } diff --git a/gradle.properties b/gradle.properties index 0578150..c97cbff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ +org.gradle.jvmargs=-Xmx512m kotlin.code.style=official org.gradle.parallel=true kotlin.js.generate.externals=true @@ -6,32 +7,22 @@ kotlin.incremental.js=true android.useAndroidX=true android.enableJetifier=true -kotlin_version=1.7.10 -kotlin_serialisation_core_version=1.4.0 + +kotlin_version=1.7.20 +kotlin_serialisation_core_version=1.4.1 github_release_plugin_version=2.4.1 -tgbotapi_version=3.2.7 -micro_utils_version=0.12.17 +tgbotapi_version=3.3.0 +micro_utils_version=0.13.1 exposed_version=0.39.2 -plagubot_version=2.3.4 - -# ANDROID - -android_minSdkVersion=21 -android_compileSdkVersion=33 -android_buildToolsVersion=33.0.0 -dexcount_version=3.1.0 -junit_version=4.12 -test_ext_junit_version=1.1.3 -espresso_core=3.4.0 +plagubot_version=2.4.0 # Dokka -dokka_version=1.7.10 +dokka_version=1.7.20 # Project data group=dev.inmo -version=0.5.5 -android_code_version=32 +version=0.5.6 diff --git a/mppAndroidProject.gradle b/mppAndroidProject.gradle deleted file mode 100644 index 7896635..0000000 --- a/mppAndroidProject.gradle +++ /dev/null @@ -1,26 +0,0 @@ -project.version = "$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" diff --git a/mppJavaProject.gradle b/mppJavaProject.gradle deleted file mode 100644 index 5f6d62d..0000000 --- a/mppJavaProject.gradle +++ /dev/null @@ -1,39 +0,0 @@ -project.version = "$version" -project.group = "$group" - -apply from: "$publishGradlePath" - -kotlin { - jvm { - compilations.main { - kotlinOptions { - jvmTarget = "1.8" - } - } - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib') - } - } - commonTest { - dependencies { - implementation kotlin('test-common') - implementation kotlin('test-annotations-common') - } - } - - jvmTest { - dependencies { - implementation kotlin('test-junit') - } - } - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} diff --git a/mppProjectWithSerialization.gradle b/mppJavaWithJsProject.gradle similarity index 73% rename from mppProjectWithSerialization.gradle rename to mppJavaWithJsProject.gradle index d22d10b..92790b8 100644 --- a/mppProjectWithSerialization.gradle +++ b/mppJavaWithJsProject.gradle @@ -15,9 +15,6 @@ kotlin { browser() nodejs() } - android { - publishAllLibraryVariants() - } sourceSets { commonMain { @@ -43,13 +40,6 @@ kotlin { 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" - } - } } } @@ -57,5 +47,3 @@ java { sourceCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8 } - -apply from: "$defaultAndroidSettingsPresetPath"