From 8c8caa4707e2aa74b21ec6533424b2cc1a0f91a3 Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Mon, 12 Feb 2018 14:16:19 +0300 Subject: [PATCH] kotlin-test: change actual package name for test annotation typealiases to avoid potential split package situation --- .../junit/src/main/kotlin/Annotations.kt | 17 +++-------------- .../testng/src/main/kotlin/Annotations.kt | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt b/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt index ab690a3595e..ad4b5b2c9e1 100644 --- a/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt +++ b/libraries/kotlin.test/junit/src/main/kotlin/Annotations.kt @@ -1,22 +1,11 @@ /* - * 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. + * Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license + * that can be found in the license/LICENSE.txt file. */ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("kotlin.test.annotations") +@file:JvmPackageName("kotlin.test.junit.annotations") package kotlin.test public actual typealias Test = org.junit.Test diff --git a/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt b/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt index b7bd29a7526..04d3dbddbb5 100644 --- a/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt +++ b/libraries/kotlin.test/testng/src/main/kotlin/Annotations.kt @@ -5,7 +5,7 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -@file:JvmPackageName("kotlin.test.annotations") +@file:JvmPackageName("kotlin.test.testng.annotations") package kotlin.test public actual typealias Test = org.testng.annotations.Test