gradle-plugin: Remove manifest compilation parameter
This commit is contained in:
@@ -242,8 +242,6 @@ For this project the task graph will be the following:
|
|||||||
enableAssertions() // Enable assertions in binaries generated.
|
enableAssertions() // Enable assertions in binaries generated.
|
||||||
enableDebug() // Enable debugging for binaries generated.
|
enableDebug() // Enable debugging for binaries generated.
|
||||||
|
|
||||||
manifest 'path/to/manifest.file' // A manifest addend file.
|
|
||||||
|
|
||||||
// Arguments to be passed to a linker.
|
// Arguments to be passed to a linker.
|
||||||
linkerOpts 'Some linker opts'
|
linkerOpts 'Some linker opts'
|
||||||
|
|
||||||
|
|||||||
-9
@@ -95,9 +95,6 @@ open class KonanCompileTask: KonanTargetableTask() {
|
|||||||
@Optional @Input var apiVersion : String? = null
|
@Optional @Input var apiVersion : String? = null
|
||||||
internal set
|
internal set
|
||||||
|
|
||||||
@Optional @InputFile var manifest : File? = null
|
|
||||||
internal set
|
|
||||||
|
|
||||||
@Input var dumpParameters: Boolean = false
|
@Input var dumpParameters: Boolean = false
|
||||||
// TODO: Is there a better way to rerun tasks when the compiler version changes?
|
// TODO: Is there a better way to rerun tasks when the compiler version changes?
|
||||||
@Input val konanVersion = project.konanVersion
|
@Input val konanVersion = project.konanVersion
|
||||||
@@ -116,8 +113,6 @@ open class KonanCompileTask: KonanTargetableTask() {
|
|||||||
addArgIfNotNull("-target", target)
|
addArgIfNotNull("-target", target)
|
||||||
addArgIfNotNull("-language-version", languageVersion)
|
addArgIfNotNull("-language-version", languageVersion)
|
||||||
addArgIfNotNull("-api-version", apiVersion)
|
addArgIfNotNull("-api-version", apiVersion)
|
||||||
// TODO: Should we get manifests of the interops used?
|
|
||||||
addArgIfNotNull("-manifest", manifest?.canonicalPath)
|
|
||||||
|
|
||||||
addKey("-g", enableDebug)
|
addKey("-g", enableDebug)
|
||||||
addKey("-nostdlib", noStdLib)
|
addKey("-nostdlib", noStdLib)
|
||||||
@@ -229,10 +224,6 @@ open class KonanCompileConfig(
|
|||||||
_linkerOpts.addAll(args)
|
_linkerOpts.addAll(args)
|
||||||
}
|
}
|
||||||
|
|
||||||
fun manifest(arg: Any) = with(compilationTask) {
|
|
||||||
manifest = project.file(arg)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun target(tgt: String) = with(compilationTask) {
|
fun target(tgt: String) = with(compilationTask) {
|
||||||
target = tgt
|
target = tgt
|
||||||
}
|
}
|
||||||
|
|||||||
-30
@@ -175,36 +175,6 @@ class IncrementalSpecification extends BaseKonanSpecification {
|
|||||||
onlyRecompilationHappened(*results)
|
onlyRecompilationHappened(*results)
|
||||||
}
|
}
|
||||||
|
|
||||||
def 'manifest parameter change for a compilation task should cause only recompilation'() {
|
|
||||||
when:
|
|
||||||
def project = KonanInteropProject.createEmpty(projectDirectory) { KonanInteropProject it ->
|
|
||||||
it.generateSrcFile('main.kt')
|
|
||||||
}
|
|
||||||
def results = buildTwice(project) { KonanInteropProject it ->
|
|
||||||
def manifest = it.generateSrcFile('manifest', "#some manifest file")
|
|
||||||
it.addCompilationSetting("main", "manifest", manifest)
|
|
||||||
}
|
|
||||||
|
|
||||||
then:
|
|
||||||
onlyRecompilationHappened(*results)
|
|
||||||
}
|
|
||||||
|
|
||||||
def 'manifest file change should cause only recompilation'() {
|
|
||||||
when:
|
|
||||||
def manifest
|
|
||||||
def project = KonanInteropProject.createEmpty(projectDirectory) { KonanInteropProject it ->
|
|
||||||
it.generateSrcFile('main.kt')
|
|
||||||
manifest = it.generateSrcFile('manifest', "#some manifest file\n")
|
|
||||||
it.addCompilationSetting("main", "manifest", manifest)
|
|
||||||
}
|
|
||||||
def results = buildTwice(project) { KonanInteropProject it ->
|
|
||||||
manifest.append("#something else\n")
|
|
||||||
}
|
|
||||||
|
|
||||||
then:
|
|
||||||
onlyRecompilationHappened(*results)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Unroll("#parameter change for an interop task should cause recompilation and interop reprocessing")
|
@Unroll("#parameter change for an interop task should cause recompilation and interop reprocessing")
|
||||||
def 'Parameter change for an interop task should cause recompilation and interop reprocessing'() {
|
def 'Parameter change for an interop task should cause recompilation and interop reprocessing'() {
|
||||||
when:
|
when:
|
||||||
|
|||||||
Reference in New Issue
Block a user