[K/N] Fixed a problem with dependencies
-Xinclude-library should be treated exactly as source files - the final binary should depend on all of them. #KT-64408 Fixed
This commit is contained in:
+1
-1
@@ -193,7 +193,7 @@ internal class DependenciesTrackerImpl(
|
||||
}
|
||||
}
|
||||
|
||||
if (filesUsed.isEmpty()) {
|
||||
if (filesUsed.isEmpty() || library in config.resolve.includedLibraries) {
|
||||
// This is the case when we depend on the whole module rather than on a number of files.
|
||||
moduleDependencies.add(library)
|
||||
addAllDependencies(cache)
|
||||
|
||||
-2
@@ -2,8 +2,6 @@
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
// KT-64408: when undisabled (by removing next line), the compiled .kexe wrongly contains no tests
|
||||
// DISABLE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
|
||||
|
||||
// FILE: lib.kt
|
||||
var z1 = false
|
||||
|
||||
-2
@@ -2,8 +2,6 @@
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
// KT-64408: when undisabled (by removing next line), the compiled .kexe wrongly contains no tests
|
||||
// DISABLE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
|
||||
|
||||
// FILE: lib.kt
|
||||
var z1 = false
|
||||
|
||||
Vendored
-2
@@ -2,8 +2,6 @@
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
// KT-64408: when undisabled (by removing next line), the compiled .kexe wrongly contains no tests
|
||||
// DISABLE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
|
||||
|
||||
// FILE: lib.kt
|
||||
@ThreadLocal
|
||||
|
||||
Vendored
-2
@@ -2,8 +2,6 @@
|
||||
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||
*/
|
||||
// KT-64408: when undisabled (by removing next line), the compiled .kexe wrongly contains no tests
|
||||
// DISABLE_NATIVE: cacheMode=STATIC_PER_FILE_EVERYWHERE
|
||||
|
||||
// FILE: lib.kt
|
||||
@ThreadLocal
|
||||
|
||||
Reference in New Issue
Block a user