kscience/gradle-tools
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 9 Wiki Activity

Update kotlin to 1.4.20-M2

Browse Source 
Update serialization to 1.0.0
This commit is contained in:
Alexander Nozik 2020-10-20 08:38:40 +03:00
parent 2fc4bb1f3d
commit f44a0aaa3e
4 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle.kts
View File

@ -2,11 +2,11 @@ plugins {
`java-gradle-plugin`
`kotlin-dsl`
`maven-publish`
id("org.jetbrains.changelog") version "0.5.0"
id("org.jetbrains.changelog") version "0.6.2"
}
group = "ru.mipt.npm"
version = "0.6.3-dev-1.4.20-M1"
version = "0.6.3-dev-1.4.20-M2"
repositories {
gradlePluginPortal()
@ -16,7 +16,7 @@ repositories {
maven("https://dl.bintray.com/kotlin/kotlin-dev")
}
val kotlinVersion = "1.4.20-M1"
val kotlinVersion = "1.4.20-M2"
java {
targetCompatibility = JavaVersion.VERSION_1_8

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

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

8
src/main/kotlin/ru/mipt/npm/gradle/KScienceVersions.kt
View File

@ -6,17 +6,17 @@ import org.gradle.api.JavaVersion
* Build constants
*/
object KScienceVersions {
const val kotlinVersion = "1.4.20-M1"
const val kotlinVersion = "1.4.20-M2"
const val kotlinxNodeVersion = "0.0.7"
const val coroutinesVersion = "1.3.9"
const val serializationVersion = "1.0.0-RC2"
const val serializationVersion = "1.0.0"
const val atomicVersion = "0.14.4"
val JVM_TARGET = JavaVersion.VERSION_11
object Serialization{
const val xmlVersion = "0.80.0-RC"
const val xmlVersion = "0.80.1"
const val yamlVersion = "0.21.0"
const val bsonVersion = "0.4.1-rc"
const val bsonVersion = "0.4.2"
}
}

11
src/main/kotlin/ru/mipt/npm/gradle/serialization.kt
View File

@ -1,8 +1,6 @@
package ru.mipt.npm.gradle
import org.gradle.api.Project
import org.gradle.kotlin.dsl.maven
import org.gradle.kotlin.dsl.repositories
class SerializationTargets(
val sourceSet: DependencySourceSet,
@ -42,13 +40,8 @@ class SerializationTargets(
fun Project.xml(
version: String = KScienceVersions.Serialization.xmlVersion
) {
repositories {
maven("https://dl.bintray.com/pdvrieze/maven")
}
useDependency(
"common" to "net.devrieze:xmlutil-serialization:$version",
"jvm" to "net.devrieze:xmlutil-serialization:$version",
"js" to "net.devrieze:xmlutil-serialization:$version",
useCommonDependency(
"net.devrieze:xmlutil-serialization:$version",
dependencySourceSet = sourceSet,
dependencyConfiguration = configuration
)