InsanusMokrassar
/
KotlinMultiplatformProjectTemplate
mirror of https://github.com/InsanusMokrassar/KotlinMultiplatformProjectTemplate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

updates and migration onto toml

This commit is contained in:
InsanusMokrassar 2022-01-29 21:47:34 +06:00
parent 052072dd5a
commit 5494671ee1
10 changed files with 84 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -10,6 +10,8 @@ build/
out/
secret.gradle
local.properties
local.*
local/
kotlin-js-store/
publishing.sh

10
build.gradle
View File

@ -7,11 +7,11 @@ buildscript {
}
dependencies {
classpath 'com.android.tools.build:gradle:4.2.2'
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"
classpath libs.android.tools.build
classpath libs.android.dexcount
classpath libs.kotlin.gradle.plugin
classpath libs.kotlin.serialization.plugin
classpath libs.kotlin.dokka.plugin
}
}

8
defaultAndroidSettings.gradle
View File

@ -26,12 +26,12 @@ android {
}
}
compileSdkVersion "$android_compileSdkVersion".toInteger()
buildToolsVersion "$android_buildToolsVersion"
compileSdkVersion libs.versions.android.compileSdk.get().toInteger()
buildToolsVersion libs.versions.android.buildTools.get()
defaultConfig {
minSdkVersion "$android_minSdkVersion".toInteger()
targetSdkVersion "$android_compileSdkVersion".toInteger()
minSdkVersion libs.versions.android.minSdk.get().toInteger()
targetSdkVersion libs.versions.android.compileSdk.get().toInteger()
versionCode "${android_code_version}".toInteger()
versionName "$version"
}

19
gradle.properties
View File

@ -6,25 +6,6 @@ kotlin.incremental.js=true
android.useAndroidX=true
android.enableJetifier=true
kotlin_version=1.6.10
kotlin_serialisation_core_version=1.3.2
# github_release_plugin_version=2.2.12
# ANDROID
android_minSdkVersion=21
android_compileSdkVersion=32
android_buildToolsVersion=32.0.0
dexcount_version=3.0.1
junit_version=4.12
test_ext_junit_version=1.1.2
espresso_core=3.3.0
# Dokka
dokka_version=1.6.10
# Project data
group=project_group

38
gradle/libs.versions.toml Normal file
View File

@ -0,0 +1,38 @@
[versions]
kotlin = "1.6.10"
kotlin-serialization = "1.3.2"
kotlin-gradle-plugin = "7.0.2"
dexcount = "3.0.1"
junit_version = "4.12"
test_ext_junit_version = "1.1.2"
espresso_core = "3.3.0"
android-minSdk = "21"
android-compileSdk = "32"
android-buildTools = "32.0.0"
[libraries]
kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
kotlin-serialization = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlin-serialization" }
kotlin-test-common = { module = "org.jetbrains.kotlin:kotlin-test-common", version.ref = "kotlin" }
kotlin-test-annotations-common = { module = "org.jetbrains.kotlin:kotlin-test-annotations-common", version.ref = "kotlin" }
kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" }
kotlin-test-js = { module = "org.jetbrains.kotlin:kotlin-test-js", version.ref = "kotlin" }
android-test-junit = { module = "androidx.test.ext:junit", version.ref = "test_ext_junit_version" }
android-test-espresso-core = { module = "androidx.test.espresso:espresso-core", version.ref = "espresso_core" }
# buildscript classpaths
android-tools-build = { module = "com.android.tools.build:gradle", version.ref = "kotlin-gradle-plugin" }
android-dexcount = { module = "com.getkeepsafe.dexcount:dexcount-gradle-plugin", version.ref = "dexcount" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
kotlin-serialization-plugin = { module = "org.jetbrains.kotlin:kotlin-serialization", version.ref = "kotlin" }
kotlin-dokka-plugin = { module = "org.jetbrains.dokka:dokka-gradle-plugin", version.ref = "kotlin" }
[plugins]
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }

14
mppAndroidProject.gradle
View File

@ -11,13 +11,21 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation kotlin('stdlib')
implementation libs.kotlin
api libs.kotlin.serialization
}
}
commonTest {
dependencies {
implementation kotlin('test-common')
implementation kotlin('test-annotations-common')
implementation libs.kotlin.test.common
implementation libs.kotlin.test.annotations.common
}
}
androidTest {
dependencies {
implementation libs.kotlin.test.junit
implementation libs.android.test.junit
implementation libs.android.test.espresso.core
}
}
}

10
mppJavaProject.gradle
View File

@ -9,19 +9,19 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation kotlin('stdlib')
implementation libs.kotlin
api libs.kotlin.serialization
}
}
commonTest {
dependencies {
implementation kotlin('test-common')
implementation kotlin('test-annotations-common')
implementation libs.kotlin.test.common
implementation libs.kotlin.test.annotations.common
}
}
jvmTest {
dependencies {
implementation kotlin('test-junit')
implementation libs.kotlin.test.junit
}
}
}

11
mppJsProject.gradle
View File

@ -12,19 +12,20 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation kotlin('stdlib')
implementation libs.kotlin
api libs.kotlin.serialization
}
}
commonTest {
dependencies {
implementation kotlin('test-common')
implementation kotlin('test-annotations-common')
implementation libs.kotlin.test.common
implementation libs.kotlin.test.annotations.common
}
}
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
implementation libs.kotlin.test.js
implementation libs.kotlin.test.junit
}
}
}

20
mppProjectWithSerialization.gradle
View File

@ -16,32 +16,32 @@ kotlin {
sourceSets {
commonMain {
dependencies {
implementation kotlin('stdlib')
api "org.jetbrains.kotlinx:kotlinx-serialization-json:$kotlin_serialisation_core_version"
implementation libs.kotlin
api libs.kotlin.serialization
}
}
commonTest {
dependencies {
implementation kotlin('test-common')
implementation kotlin('test-annotations-common')
implementation libs.kotlin.test.common
implementation libs.kotlin.test.annotations.common
}
}
jvmTest {
dependencies {
implementation kotlin('test-junit')
implementation libs.kotlin.test.junit
}
}
jsTest {
dependencies {
implementation kotlin('test-js')
implementation kotlin('test-junit')
implementation libs.kotlin.test.js
implementation libs.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"
implementation libs.kotlin.test.junit
implementation libs.android.test.junit
implementation libs.android.test.espresso.core
}
}
}

2
settings.gradle
View File

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