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

Wizard: fix invalid path in generated buildscript on windows

Browse Source
This commit is contained in:
Ilya Kirillov
2020-08-26 12:18:30 +03:00
parent c93ae64546
commit c8ab827fa0
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/core/utils.kt
+2
View File
@@ -45,6 +45,8 @@ operator fun @receiver:NonNls String.div(@NonNls other: String): Path =
fun @receiver:NonNls String.asPath(): Path = Paths.get(this) fun @receiver:NonNls String.asPath(): Path = Paths.get(this)
fun Path.asStringWithUnixSlashes() = toString().replace('\\', '/')
fun <T : Any> safe(operation: () -> T): TaskResult<T> = fun <T : Any> safe(operation: () -> T): TaskResult<T> =
try { try {
Success(operation()) Success(operation())
libraries/tools/new-project-wizard/src/org/jetbrains/kotlin/tools/projectWizard/ir/buildsystem/gradle/AndroidIR.kt
+3 -2
View File
@@ -1,5 +1,6 @@
package org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle package org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.gradle
import org.jetbrains.kotlin.tools.projectWizard.core.asStringWithUnixSlashes
import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.FreeIR import org.jetbrains.kotlin.tools.projectWizard.ir.buildsystem.FreeIR
import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter import org.jetbrains.kotlin.tools.projectWizard.plugins.printer.GradlePrinter
import org.jetbrains.kotlin.tools.projectWizard.settings.JavaPackage import org.jetbrains.kotlin.tools.projectWizard.settings.JavaPackage
@@ -15,10 +16,10 @@ data class AndroidConfigIR(val javaPackage: JavaPackage?, val newManifestPath: P
if (newManifestPath != null) { if (newManifestPath != null) {
when (dsl) { when (dsl) {
GradlePrinter.GradleDsl.KOTLIN -> { GradlePrinter.GradleDsl.KOTLIN -> {
+"""sourceSets["main"].manifest.srcFile("$newManifestPath")""" +"""sourceSets["main"].manifest.srcFile("${newManifestPath.asStringWithUnixSlashes()}")"""
} }
GradlePrinter.GradleDsl.GROOVY -> { GradlePrinter.GradleDsl.GROOVY -> {
+"""sourceSets.main.manifest.srcFile('$newManifestPath')""" +"""sourceSets.main.manifest.srcFile('${newManifestPath.asStringWithUnixSlashes()}')"""
} }
} }
nlIndented() nlIndented()