Merge pull request #41 from InsanusMokrassar/1.2.0

1.2.0
This commit is contained in:
InsanusMokrassar 2023-07-28 12:21:55 +06:00 committed by GitHub
commit 875d2d723e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 14 additions and 9 deletions

View File

@ -1,5 +1,9 @@
# Changelog # Changelog
## 1.2.0
* `Kotlin`: `1.9.0`
## 1.1.2 ## 1.1.2
* `Kotlin`: `1.8.22` * `Kotlin`: `1.8.22`

View File

@ -19,6 +19,7 @@ buildscript {
plugins { plugins {
alias(libs.plugins.kotlin.multiplatform) alias(libs.plugins.kotlin.multiplatform)
alias(libs.plugins.kotlin.dokka) alias(libs.plugins.kotlin.dokka)
alias(libs.plugins.versions)
} }
apply plugin: "com.android.library" apply plugin: "com.android.library"

View File

@ -55,10 +55,6 @@ android {
targetCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8
} }
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
sourceSets { sourceSets {
String sep = File.separator String sep = File.separator
main.java.srcDirs += "src${sep}main${sep}kotlin" main.java.srcDirs += "src${sep}main${sep}kotlin"

View File

@ -10,5 +10,5 @@ org.gradle.jvmargs=-Xmx512m
# Project data # Project data
group=dev.inmo group=dev.inmo
version=1.1.2 version=1.2.0
android_code_version=21 android_code_version=22

View File

@ -1,8 +1,10 @@
[versions] [versions]
kotlin = "1.8.22" kotlin = "1.9.0"
kotlin-gradle-plugin = "7.4.2" kotlin-gradle-plugin = "7.4.2"
versions = "0.47.0"
dokka = "1.8.20" dokka = "1.8.20"
dexcount = "4.0.0" dexcount = "4.0.0"
@ -12,7 +14,7 @@ espresso_core = "3.5.1"
android-minSdk = "21" android-minSdk = "21"
android-compileSdk = "33" android-compileSdk = "33"
android-buildTools = "33.0.1" android-buildTools = "33.0.2"
github-release = "2.4.1" github-release = "2.4.1"
@ -38,3 +40,5 @@ github-release = { module = "com.github.breadmoirai:github-release", version.ref
kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" } kotlin-dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
versions = { id = "com.github.ben-manes.versions", version.ref = "versions" }

View File

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