azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore kotlin-stdlib-jre7/8 libraries

Browse Source
This commit is contained in:
Alexander Udalov
2017-09-14 12:38:17 +03:00
committed by Ilya Gorbunov
parent e253acd5fd
commit 537a0ce315
19 changed files with 1127 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/stdlib/jre7/build.gradle
+82
View File
@@ -0,0 +1,82 @@
description = 'Kotlin Standard Library JRE 7 extension (deprecated)'
apply plugin: 'kotlin'
configureJvm6Project(project)
configurePublishing(project)
ext.javaHome = JDK_17
dependencies {
compile project(':kotlin-stdlib')
testCompile project(':kotlin-test:kotlin-test-junit')
}
sourceSets {
main {
kotlin {
srcDir 'src'
}
}
test {
kotlin {
srcDir 'test'
if(!System.properties.'idea.active') {
srcDir '../test'
}
}
}
}
jar {
manifestAttributes(manifest, project, 'Main')
}
artifacts {
archives sourcesJar
archives javadocJar
}
dist {
from (jar, sourcesJar)
}
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) {
kotlinOptions.jdkHome = JDK_17
}
compileKotlin {
kotlinOptions.freeCompilerArgs = [
"-Xallow-kotlin-package",
"-Xmultifile-parts-inherit",
"-Xdump-declarations-to", "${buildDir}/stdlib-jre7-declarations.json",
"-module-name", project.name
]
}
compileTestKotlin {
kotlinOptions.freeCompilerArgs = ["-Xallow-kotlin-package"]
}
kotlin.experimental.coroutines 'enable'
test {
executable = "$JDK_17/bin/java"
}
task testJre6Tests(type: Test) {
dependsOn(':kotlin-stdlib:testClasses')
group = "verification"
executable = "$JDK_17/bin/java"
doFirst {
testClassesDirs = project(':kotlin-stdlib').sourceSets.test.output
classpath = files(
testClassesDirs,
configurations.testCompile
)
}
}
check.dependsOn testJre6Tests
libraries/stdlib/jre7/src/kotlin/AutoCloseable.kt
+62
View File
@@ -0,0 +1,62 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:JvmName("AutoCloseableKt")
package kotlin
/**
* Executes the given [block] function on this resource and then closes it down correctly whether an exception
* is thrown or not.
*
* In case if the resource is being closed due to an exception occurred in [block], and the closing also fails with an exception,
* the latter is added to the [suppressed][java.lang.Throwable.addSuppressed] exceptions of the former.
*
* @param block a function to process this [AutoCloseable] resource.
* @return the result of [block] function invoked on this resource.
*/
@SinceKotlin("1.1")
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER")
@kotlin.internal.InlineOnly
public inline fun <T : AutoCloseable?, R> T.use(block: (T) -> R): R {
var exception: Throwable? = null
try {
return block(this)
} catch (e: Throwable) {
exception = e
throw e
} finally {
this.closeFinally(exception)
}
}
/**
* Closes this [AutoCloseable], suppressing possible exception or error thrown by [AutoCloseable.close] function when
* it's being closed due to some other [cause] exception occurred.
*
* The suppressed exception is added to the list of suppressed exceptions of [cause] exception.
*/
@SinceKotlin("1.1")
@PublishedApi
internal fun AutoCloseable?.closeFinally(cause: Throwable?) = when {
this == null -> {}
cause == null -> close()
else ->
try {
close()
} catch (closeException: Throwable) {
cause.addSuppressed(closeException)
}
}
libraries/stdlib/jre7/src/kotlin/internal/JRE7PlatformImplementations.kt
+24
View File
@@ -0,0 +1,24 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.internal
@Suppress("INVISIBLE_REFERENCE", "INVISIBLE_MEMBER", "CANNOT_OVERRIDE_INVISIBLE_MEMBER")
internal open class JRE7PlatformImplementations : PlatformImplementations() {
override fun addSuppressed(cause: Throwable, exception: Throwable) = cause.addSuppressed(exception)
}
libraries/stdlib/jre7/test/TryWithResourcesAutoCloseableTest.kt
+128
View File
@@ -0,0 +1,128 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.jdk7.test
import java.io.*
import org.junit.Test
import java.util.*
import kotlin.test.*
class TryWithResourcesAutoCloseableTest {
@Suppress("HasPlatformType") fun <T> platformNull() = Collections.singletonList(null as T).first()
class Resource(val faultyClose: Boolean = false) : AutoCloseable {
var isClosed = false
private set
override fun close() {
if (faultyClose)
throw IOException("Close failed")
isClosed = true
}
}
@Test fun success() {
val resource = Resource()
val result = resource.use { "ok" }
assertEquals("ok", result)
assertTrue(resource.isClosed)
}
@Test fun closeFails() {
val e = assertFails {
Resource(faultyClose = true).use { "" }
}
assertTrue(e is IOException)
}
@Test fun opFailsCloseSuccess() {
val e = assertFails {
Resource().use { error("op fail") }
}
assertTrue(e is IllegalStateException)
assertTrue(e.suppressed.isEmpty())
}
@Test fun opFailsCloseFails() {
val e = assertFails {
Resource(faultyClose = true).use { error("op fail") }
}
assertTrue(e is IllegalStateException)
assertTrue(e.suppressed.single() is IOException)
}
@Test fun opFailsCloseFailsTwice() {
val e = assertFails {
Resource(faultyClose = true).use { _ ->
Resource(faultyClose = true).use { _ ->
error("op fail")
}
}
}
assertTrue(e is IllegalStateException)
val suppressed = e.suppressed
assertEquals(2, suppressed.size)
assertTrue(suppressed.all { it is IOException })
}
@Test fun nonLocalReturnInBlock() {
fun Resource.operation(nonLocal: Boolean): String {
return use { if (nonLocal) return "nonLocal" else "local" }
}
Resource().let { resource ->
val result = resource.operation(nonLocal = false)
assertEquals("local", result)
assertTrue(resource.isClosed)
}
Resource().let { resource ->
val result = resource.operation(nonLocal = true)
assertEquals("nonLocal", result)
assertTrue(resource.isClosed)
}
}
@Test fun nullableResourceSuccess() {
val resource: Resource? = null
val result = resource.use { "ok" }
assertEquals("ok", result)
}
@Test fun nullableResourceOpFails() {
val resource: Resource? = null
val e = assertFails {
resource.use { requireNotNull(it) }
}
assertTrue(e is IllegalArgumentException)
assertTrue(e.suppressed.isEmpty())
}
@Test fun platformResourceOpFails() {
val resource = platformNull<Resource>()
val e = assertFails {
resource.use { requireNotNull(it) }
}
assertTrue(e is IllegalArgumentException)
assertTrue(e.suppressed.isEmpty())
}
}
libraries/stdlib/jre7/test/TryWithResourcesCloseableTest.kt
+129
View File
@@ -0,0 +1,129 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package kotlin.jdk7.test
import org.junit.Ignore
import java.io.*
import org.junit.Test
import java.util.*
import kotlin.test.*
class TryWithResourcesCloseableTest {
@Suppress("HasPlatformType") fun <T> platformNull() = Collections.singletonList(null as T).first()
class Resource(val faultyClose: Boolean = false) : Closeable {
var isClosed = false
private set
override fun close() {
if (faultyClose)
throw IOException("Close failed")
isClosed = true
}
}
@Test fun success() {
val resource = Resource()
val result = resource.use { "ok" }
assertEquals("ok", result)
assertTrue(resource.isClosed)
}
@Test fun closeFails() {
val e = assertFails {
Resource(faultyClose = true).use { "" }
}
assertTrue(e is IOException)
}
@Test fun opFailsCloseSuccess() {
val e = assertFails {
Resource().use { error("op fail") }
}
assertTrue(e is IllegalStateException)
assertTrue(e.suppressed.isEmpty())
}
@Ignore
@Test fun opFailsCloseFails() {
val e = assertFails {
Resource(faultyClose = true).use { error("op fail") }
}
assertTrue(e is IllegalStateException)
assertTrue(e.suppressed.single() is IOException)
}
@Ignore
@Test fun opFailsCloseFailsTwice() {
val e = assertFails {
Resource(faultyClose = true).use { _ ->
Resource(faultyClose = true).use { _ ->
error("op fail")
}
}
}
assertTrue(e is IllegalStateException)
val suppressed = e.suppressed
assertEquals(2, suppressed.size)
assertTrue(suppressed.all { it is IOException })
}
@Test fun nonLocalReturnInBlock() {
fun Resource.operation(nonLocal: Boolean): String {
return use { if (nonLocal) return "nonLocal" else "local" }
}
Resource().let { resource ->
val result = resource.operation(nonLocal = false)
assertEquals("local", result)
assertTrue(resource.isClosed)
}
Resource().let { resource ->
val result = resource.operation(nonLocal = true)
assertEquals("nonLocal", result)
assertTrue(resource.isClosed)
}
}
@Test fun nullableResourceSuccess() {
val resource: Resource? = null
val result = resource.use { "ok" }
assertEquals("ok", result)
}
@Test fun nullableResourceOpFails() {
val resource: Resource? = null
val e = assertFails {
resource.use { requireNotNull(it) }
}
assertTrue(e is IllegalArgumentException)
assertTrue(e.suppressed.isEmpty())
}
@Test fun platformResourceOpFails() {
val resource = platformNull<Resource>()
val e = assertFails {
resource.use { requireNotNull(it) }
}
assertTrue(e is IllegalArgumentException)
assertTrue(e.suppressed.isEmpty())
}
}
libraries/stdlib/jre7/test/internalAnnotations.kt
+22
View File
@@ -0,0 +1,22 @@
/*
* Copyright 2010-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
@file:JvmVersion
package kotlin.jvm
@Target(AnnotationTarget.FILE, AnnotationTarget.CLASS, AnnotationTarget.PROPERTY, AnnotationTarget.CONSTRUCTOR, AnnotationTarget.FUNCTION)
@Retention(AnnotationRetention.SOURCE)
internal annotation class JvmVersion(public val minimum: Int = 6, public val maximum: Int = 100)