Skip to content

Commit

Permalink
Version 1.3.0: Kotlin 1.4
Browse files Browse the repository at this point in the history
  • Loading branch information
Salomon BRYS committed Aug 18, 2020
1 parent 70c730f commit 9e2e531
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
8 changes: 1 addition & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,9 @@ plugins {
id("org.kodein.root")
}

buildscript {
repositories {
maven(url = "https://kotlin.bintray.com/kotlinx")
}
}

allprojects {
group = "org.kodein.type"
version = "1.2.0"
version = "1.3.0"
}

kodeinPublications {
Expand Down
3 changes: 1 addition & 2 deletions kodein-type/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ kodein {
}

sourceSets.all {
languageSettings.useExperimentalAnnotation("kotlin.Experimental")
languageSettings.enableLanguageFeature("NewInference")
languageSettings.useExperimentalAnnotation("kotlin.RequiresOptIn")
}
}
}
Expand Down
1 change: 0 additions & 1 deletion kodein-type/src/jvmTest/kotlin/org/kodein/type/JavaType.kt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ class JavaType {
assertNotEquals<TypeToken<*>>(erased(String::class.java), erased(Int::class.java))
}

@ExperimentalStdlibApi
@Test fun test01_jvmType() {
assertEquals(String::class.java, erased<String>().jvmType)

Expand Down
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
maven(url = "https://dl.bintray.com/kodein-framework/Kodein-Internal-Gradle")
}
dependencies {
classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:3.7.0-kotlin-1.4-rc-74")
classpath("org.kodein.internal.gradle:kodein-internal-gradle-settings:4.0.0")
}
}

Expand Down

0 comments on commit 9e2e531

Please sign in to comment.