@@ -17,9 +17,6 @@ open class JsSourceGeneratorTask
17
17
@Input
18
18
lateinit var title: String
19
19
20
- @Input
21
- var ir: Boolean = false
22
-
23
20
@Input
24
21
var useBenchmarkJs: Boolean = true
25
22
@@ -48,7 +45,7 @@ open class JsSourceGeneratorTask
48
45
}
49
46
50
47
private fun generateSources (lib : File ) {
51
- val modules = load (lib)
48
+ val modules = loadIr (lib, LockBasedStorageManager ( " Inspect " ) )
52
49
modules.forEach { module ->
53
50
val generator = SuiteSourceGenerator (
54
51
title,
@@ -60,29 +57,11 @@ open class JsSourceGeneratorTask
60
57
}
61
58
}
62
59
63
- private fun load (lib : File ): List <ModuleDescriptor > {
64
- val storageManager = LockBasedStorageManager (" Inspect" )
65
- return if (ir) {
66
- loadIr(lib, storageManager)
67
- } else {
68
- loadLegacy(lib, storageManager)
69
- }
70
- }
71
-
72
60
private fun loadIr (lib : File , storageManager : StorageManager ): List <ModuleDescriptor > {
73
- // skip processing of empty dirs (fail if not to do it)
61
+ // skip processing of empty dirs (fails if not to do it)
74
62
if (lib.listFiles() == null ) return emptyList()
75
63
val dependencies = inputDependencies.files.filterNot { it.extension == " js" }.toSet()
76
64
val module = KlibResolver .JS .createModuleDescriptor(lib, dependencies, storageManager)
77
65
return listOf (module)
78
66
}
79
-
80
- private fun loadLegacy (lib : File , storageManager : StorageManager ): List <ModuleDescriptor > {
81
- val dependencies = inputDependencies.flatMap {
82
- loadJsDescriptors(it, storageManager)
83
- }
84
- return loadJsDescriptors(lib, storageManager, dependencies)
85
- }
86
67
}
87
-
88
-
0 commit comments