From 8a6925e95c036edd261155bf760827312809faa9 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Oct 2022 22:08:50 +0600 Subject: [PATCH 1/5] start 0.5.6 --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0578150..cf17c88 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ dokka_version=1.7.10 # Project data group=dev.inmo -version=0.5.5 -android_code_version=32 +version=0.5.6 +android_code_version=33 From 7163f7d64aa5388bdae13a8be5357152ad10a227 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Oct 2022 22:09:39 +0600 Subject: [PATCH 2/5] update dependencies --- gradle.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index cf17c88..dd9057a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,15 +6,15 @@ 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 +plagubot_version=2.4.0 # ANDROID @@ -28,7 +28,7 @@ espresso_core=3.4.0 # Dokka -dokka_version=1.7.10 +dokka_version=1.7.20 # Project data From 62fb8854b9358638ea7c13246af6bd5337efce9e Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Oct 2022 22:28:32 +0600 Subject: [PATCH 3/5] remove android targets in all modules due to the fact that currently there is no any android-specific code there --- cache/admins/common/build.gradle | 3 +- cache/admins/micro_utils/build.gradle | 3 +- cache/admins/plagubot/build.gradle | 3 +- cache/content/common/build.gradle | 3 +- cache/content/micro_utils/build.gradle | 3 +- extensions.gradle | 3 +- gradle.properties | 2 ++ mppJavaWithJsProject.gradle | 49 ++++++++++++++++++++++++++ 8 files changed, 58 insertions(+), 11 deletions(-) create mode 100644 mppJavaWithJsProject.gradle 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/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/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/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/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/extensions.gradle b/extensions.gradle index f686575..a01b906 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,9 +13,10 @@ allprojects { projectByName(name) } - mppProjectWithSerializationPresetPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" + mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" + mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle" defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" diff --git a/gradle.properties b/gradle.properties index dd9057a..777dab7 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,6 +7,7 @@ kotlin.incremental.js=true android.useAndroidX=true android.enableJetifier=true + kotlin_version=1.7.20 kotlin_serialisation_core_version=1.4.1 diff --git a/mppJavaWithJsProject.gradle b/mppJavaWithJsProject.gradle new file mode 100644 index 0000000..92790b8 --- /dev/null +++ b/mppJavaWithJsProject.gradle @@ -0,0 +1,49 @@ +project.version = "$version" +project.group = "$group" + +apply from: "$publishGradlePath" + +kotlin { + jvm { + compilations.main { + kotlinOptions { + jvmTarget = "1.8" + } + } + } + js (IR) { + browser() + nodejs() + } + + sourceSets { + commonMain { + dependencies { + implementation kotlin('stdlib') + api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version" + } + } + commonTest { + dependencies { + implementation kotlin('test-common') + implementation kotlin('test-annotations-common') + } + } + jvmTest { + dependencies { + implementation kotlin('test-junit') + } + } + jsTest { + dependencies { + implementation kotlin('test-js') + implementation kotlin('test-junit') + } + } + } +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} From d118a3d06071a3a826a216ddafffe67d2a9cb92b Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Oct 2022 22:29:38 +0600 Subject: [PATCH 4/5] remove redundant xmls --- cache/admins/common/src/main/AndroidManifest.xml | 1 - cache/admins/micro_utils/src/main/AndroidManifest.xml | 1 - cache/admins/plagubot/src/main/AndroidManifest.xml | 1 - cache/content/common/src/main/AndroidManifest.xml | 1 - cache/content/micro_utils/src/main/AndroidManifest.xml | 1 - 5 files changed, 5 deletions(-) delete mode 100644 cache/admins/common/src/main/AndroidManifest.xml delete mode 100644 cache/admins/micro_utils/src/main/AndroidManifest.xml delete mode 100644 cache/admins/plagubot/src/main/AndroidManifest.xml delete mode 100644 cache/content/common/src/main/AndroidManifest.xml delete mode 100644 cache/content/micro_utils/src/main/AndroidManifest.xml 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/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/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/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/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 @@ - From e8cb9556db1cef2986feda7388ea2be187be4834 Mon Sep 17 00:00:00 2001 From: InsanusMokrassar Date: Sat, 22 Oct 2022 22:33:45 +0600 Subject: [PATCH 5/5] cleanup --- build.gradle | 2 - defaultAndroidSettings.gradle | 40 -------------------- extensions.gradle | 5 --- gradle.properties | 11 ------ mppAndroidProject.gradle | 26 ------------- mppJavaProject.gradle | 39 ------------------- mppProjectWithSerialization.gradle | 61 ------------------------------ 7 files changed, 184 deletions(-) delete mode 100644 defaultAndroidSettings.gradle delete mode 100644 mppAndroidProject.gradle delete mode 100644 mppJavaProject.gradle delete mode 100644 mppProjectWithSerialization.gradle 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/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 a01b906..4141eba 100644 --- a/extensions.gradle +++ b/extensions.gradle @@ -13,13 +13,8 @@ allprojects { projectByName(name) } - mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppProjectWithSerialization.gradle" - mppJavaProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppJavaProject.gradle" - mppAndroidProjectPresetPath = "${rootProject.projectDir.absolutePath}/mppAndroidProject.gradle" mppJavaWithJsProjectPath = "${rootProject.projectDir.absolutePath}/mppJavaWithJsProject.gradle" - defaultAndroidSettingsPresetPath = "${rootProject.projectDir.absolutePath}/defaultAndroidSettings.gradle" - publishGradlePath = "${rootProject.projectDir.absolutePath}/publish.gradle" } } diff --git a/gradle.properties b/gradle.properties index 777dab7..c97cbff 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,16 +18,6 @@ micro_utils_version=0.13.1 exposed_version=0.39.2 plagubot_version=2.4.0 -# 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 - # Dokka dokka_version=1.7.20 @@ -36,4 +26,3 @@ dokka_version=1.7.20 group=dev.inmo version=0.5.6 -android_code_version=33 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/mppProjectWithSerialization.gradle deleted file mode 100644 index d22d10b..0000000 --- a/mppProjectWithSerialization.gradle +++ /dev/null @@ -1,61 +0,0 @@ -project.version = "$version" -project.group = "$group" - -apply from: "$publishGradlePath" - -kotlin { - jvm { - compilations.main { - kotlinOptions { - jvmTarget = "1.8" - } - } - } - js (IR) { - browser() - nodejs() - } - android { - publishAllLibraryVariants() - } - - sourceSets { - commonMain { - dependencies { - implementation kotlin('stdlib') - api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version" - } - } - commonTest { - dependencies { - implementation kotlin('test-common') - implementation kotlin('test-annotations-common') - } - } - jvmTest { - dependencies { - implementation kotlin('test-junit') - } - } - jsTest { - dependencies { - implementation kotlin('test-js') - 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" - } - } - } -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -apply from: "$defaultAndroidSettingsPresetPath"