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

Fix KT-29804: rename app -> main

Browse Source 
#KT-29804 Fixed
Reviewed at KOTLIN-CR-2735
This commit is contained in:
Kirill Shmakov
2019-02-19 12:14:34 +03:00
parent db8f423880
commit b844e587ed
3 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleAbstractMultiplatformModuleBuilder.kt
+4 -3
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * Copyright 2010-2019 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. * that can be found in the license/LICENSE.txt file.
*/ */
@@ -32,6 +32,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
val mppInApplication: Boolean = false val mppInApplication: Boolean = false
) : GradleModuleBuilder() { ) : GradleModuleBuilder() {
var explicitPluginVersion: String? = null var explicitPluginVersion: String? = null
val mppDirName = "main"
override fun getNodeIcon(): Icon = KotlinIcons.MPP override fun getNodeIcon(): Icon = KotlinIcons.MPP
@@ -44,7 +45,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
} }
private fun setupMppModule(module: Module, parentDir: VirtualFile): VirtualFile? { private fun setupMppModule(module: Module, parentDir: VirtualFile): VirtualFile? {
val moduleDir = parentDir.createChildDirectory(this, "app") val moduleDir = parentDir.createChildDirectory(this, mppDirName)
val buildGradle = moduleDir.createChildData(null, "build.gradle") val buildGradle = moduleDir.createChildData(null, "build.gradle")
val builder = BuildScriptDataBuilder(buildGradle) val builder = BuildScriptDataBuilder(buildGradle)
builder.setupAdditionalDependenciesForApplication() builder.setupAdditionalDependenciesForApplication()
@@ -102,7 +103,7 @@ abstract class KotlinGradleAbstractMultiplatformModuleBuilder(
VfsUtil.saveText(buildGradle, buildGradleText) VfsUtil.saveText(buildGradle, buildGradleText)
if (mppInApplication) { if (mppInApplication) {
updateSettingsScript(module) { updateSettingsScript(module) {
it.addIncludedModules(listOf(":app")) it.addIncludedModules(listOf(":$mppDirName"))
} }
} }
createProjectSkeleton(rootDir) createProjectSkeleton(rootDir)
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/KotlinGradleMobileMultiplatformModuleBuilder.kt
+2 -2
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * Copyright 2010-2019 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. * that can be found in the license/LICENSE.txt file.
*/ */
@@ -16,7 +16,7 @@ class KotlinGradleMobileMultiplatformModuleBuilder :
private val commonName: String = "common" private val commonName: String = "common"
private var jvmTargetName: String = "android" private var jvmTargetName: String = "android"
private var nativeTargetName: String = "ios" private var nativeTargetName: String = "ios"
private val androidAppName = "app" private val androidAppName = mppDirName
private val commonSourceName get() = "$commonName$productionSuffix" private val commonSourceName get() = "$commonName$productionSuffix"
private val commonTestName get() = "$commonName$testSuffix" private val commonTestName get() = "$commonName$testSuffix"
idea/idea-gradle/src/org/jetbrains/kotlin/idea/configuration/xcode/XcodeProjectConfigurator.kt
+30 -28
View File
@@ -1,5 +1,5 @@
/* /*
* Copyright 2010-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license * Copyright 2010-2019 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. * that can be found in the license/LICENSE.txt file.
*/ */
@@ -12,6 +12,8 @@ class XcodeProjectConfigurator {
private fun VirtualFile.bufferedWriter() = getOutputStream(this).bufferedWriter() private fun VirtualFile.bufferedWriter() = getOutputStream(this).bufferedWriter()
private val mppDirName = "main"
fun createSkeleton(rootDir: VirtualFile) { fun createSkeleton(rootDir: VirtualFile) {
val iosDir = rootDir.createChildDirectory(this, "iosApp") val iosDir = rootDir.createChildDirectory(this, "iosApp")
val sourceDir = iosDir.createChildDirectory(this, "iosApp") val sourceDir = iosDir.createChildDirectory(this, "iosApp")
@@ -32,7 +34,7 @@ class XcodeProjectConfigurator {
tests.write( tests.write(
""" """
import XCTest import XCTest
import app import $mppDirName
class iosAppTests: XCTestCase { class iosAppTests: XCTestCase {
func testExample() { func testExample() {
@@ -68,7 +70,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
viewController.write( viewController.write(
""" """
import UIKit import UIKit
import app import $mppDirName
class ViewController: UIViewController { class ViewController: UIViewController {
override func viewDidLoad() { override func viewDidLoad() {
@@ -257,8 +259,8 @@ class ViewController: UIViewController {
F861D7E6207FA40F0085E80D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F861D7E4207FA40F0085E80D /* Main.storyboard */; }; F861D7E6207FA40F0085E80D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F861D7E4207FA40F0085E80D /* Main.storyboard */; };
F861D7EB207FA4100085E80D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F861D7E9207FA4100085E80D /* LaunchScreen.storyboard */; }; F861D7EB207FA4100085E80D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F861D7E9207FA4100085E80D /* LaunchScreen.storyboard */; };
F861D7F6207FA4100085E80D /* iosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F861D7F5207FA4100085E80D /* iosAppTests.swift */; }; F861D7F6207FA4100085E80D /* iosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F861D7F5207FA4100085E80D /* iosAppTests.swift */; };
F861D80C207FA4200085E80D /* app.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F861D805207FA4200085E80D /* app.framework */; }; F861D80C207FA4200085E80D /* $mppDirName.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F861D805207FA4200085E80D /* $mppDirName.framework */; };
F861D80D207FA4200085E80D /* app.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F861D805207FA4200085E80D /* app.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; F861D80D207FA4200085E80D /* $mppDirName.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = F861D805207FA4200085E80D /* $mppDirName.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */ /* Begin PBXContainerItemProxy section */
@@ -274,7 +276,7 @@ class ViewController: UIViewController {
containerPortal = F861D7D5207FA40F0085E80D /* Project object */; containerPortal = F861D7D5207FA40F0085E80D /* Project object */;
proxyType = 1; proxyType = 1;
remoteGlobalIDString = F861D804207FA4200085E80D; remoteGlobalIDString = F861D804207FA4200085E80D;
remoteInfo = app; remoteInfo = $mppDirName;
}; };
/* End PBXContainerItemProxy section */ /* End PBXContainerItemProxy section */
@@ -285,7 +287,7 @@ class ViewController: UIViewController {
dstPath = ""; dstPath = "";
dstSubfolderSpec = 10; dstSubfolderSpec = 10;
files = ( files = (
F861D80D207FA4200085E80D /* app.framework in Embed Frameworks */, F861D80D207FA4200085E80D /* $mppDirName.framework in Embed Frameworks */,
); );
name = "Embed Frameworks"; name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
@@ -293,7 +295,7 @@ class ViewController: UIViewController {
/* End PBXCopyFilesBuildPhase section */ /* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
F861D7DD207FA40F0085E80D /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; F861D7DD207FA40F0085E80D /* iosApp.$mppDirName */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.$mppDirName; sourceTree = BUILT_PRODUCTS_DIR; };
F861D7E0207FA40F0085E80D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; }; F861D7E0207FA40F0085E80D /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
F861D7E2207FA40F0085E80D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; }; F861D7E2207FA40F0085E80D /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
F861D7E5207FA40F0085E80D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; }; F861D7E5207FA40F0085E80D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@@ -302,8 +304,8 @@ class ViewController: UIViewController {
F861D7F1207FA4100085E80D /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; F861D7F1207FA4100085E80D /* iosAppTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = iosAppTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
F861D7F5207FA4100085E80D /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = "<group>"; }; F861D7F5207FA4100085E80D /* iosAppTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosAppTests.swift; sourceTree = "<group>"; };
F861D7F7207FA4100085E80D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; F861D7F7207FA4100085E80D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
F861D805207FA4200085E80D /* app.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = app.framework; sourceTree = BUILT_PRODUCTS_DIR; }; F861D805207FA4200085E80D /* $mppDirName.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = $mppDirName.framework; sourceTree = BUILT_PRODUCTS_DIR; };
F861D813207FA4520085E80D /* app */ = {isa = PBXFileReference; lastKnownFileType = folder; name = app; path = ../app; sourceTree = "<group>"; }; F861D813207FA4520085E80D /* $mppDirName */ = {isa = PBXFileReference; lastKnownFileType = folder; name = $mppDirName; path = ../$mppDirName; sourceTree = "<group>"; };
/* End PBXFileReference section */ /* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */ /* Begin PBXFrameworksBuildPhase section */
@@ -311,7 +313,7 @@ class ViewController: UIViewController {
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
F861D80C207FA4200085E80D /* app.framework in Frameworks */, F861D80C207FA4200085E80D /* $mppDirName.framework in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -328,7 +330,7 @@ class ViewController: UIViewController {
F861D7D4207FA40F0085E80D = { F861D7D4207FA40F0085E80D = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F861D813207FA4520085E80D /* app */, F861D813207FA4520085E80D /* $mppDirName */,
F861D7DF207FA40F0085E80D /* iosApp */, F861D7DF207FA40F0085E80D /* iosApp */,
F861D7F4207FA4100085E80D /* iosAppTests */, F861D7F4207FA4100085E80D /* iosAppTests */,
F861D7DE207FA40F0085E80D /* Products */, F861D7DE207FA40F0085E80D /* Products */,
@@ -338,9 +340,9 @@ class ViewController: UIViewController {
F861D7DE207FA40F0085E80D /* Products */ = { F861D7DE207FA40F0085E80D /* Products */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F861D7DD207FA40F0085E80D /* iosApp.app */, F861D7DD207FA40F0085E80D /* iosApp.$mppDirName */,
F861D7F1207FA4100085E80D /* iosAppTests.xctest */, F861D7F1207FA4100085E80D /* iosAppTests.xctest */,
F861D805207FA4200085E80D /* app.framework */, F861D805207FA4200085E80D /* $mppDirName.framework */,
); );
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -385,7 +387,7 @@ class ViewController: UIViewController {
); );
name = iosApp; name = iosApp;
productName = iosApp; productName = iosApp;
productReference = F861D7DD207FA40F0085E80D /* iosApp.app */; productReference = F861D7DD207FA40F0085E80D /* iosApp.$mppDirName */;
productType = "com.apple.product-type.application"; productType = "com.apple.product-type.application";
}; };
F861D7F0207FA4100085E80D /* iosAppTests */ = { F861D7F0207FA4100085E80D /* iosAppTests */ = {
@@ -406,9 +408,9 @@ class ViewController: UIViewController {
productReference = F861D7F1207FA4100085E80D /* iosAppTests.xctest */; productReference = F861D7F1207FA4100085E80D /* iosAppTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test"; productType = "com.apple.product-type.bundle.unit-test";
}; };
F861D804207FA4200085E80D /* app */ = { F861D804207FA4200085E80D /* $mppDirName */ = {
isa = PBXNativeTarget; isa = PBXNativeTarget;
buildConfigurationList = F861D80E207FA4200085E80D /* Build configuration list for PBXNativeTarget "app" */; buildConfigurationList = F861D80E207FA4200085E80D /* Build configuration list for PBXNativeTarget "$mppDirName" */;
buildPhases = ( buildPhases = (
F861D812207FA4320085E80D /* ShellScript */, F861D812207FA4320085E80D /* ShellScript */,
); );
@@ -416,9 +418,9 @@ class ViewController: UIViewController {
); );
dependencies = ( dependencies = (
); );
name = app; name = $mppDirName;
productName = app; productName = $mppDirName;
productReference = F861D805207FA4200085E80D /* app.framework */; productReference = F861D805207FA4200085E80D /* $mppDirName.framework */;
productType = "com.apple.product-type.framework"; productType = "com.apple.product-type.framework";
}; };
/* End PBXNativeTarget section */ /* End PBXNativeTarget section */
@@ -457,7 +459,7 @@ class ViewController: UIViewController {
targets = ( targets = (
F861D7DC207FA40F0085E80D /* iosApp */, F861D7DC207FA40F0085E80D /* iosApp */,
F861D7F0207FA4100085E80D /* iosAppTests */, F861D7F0207FA4100085E80D /* iosAppTests */,
F861D804207FA4200085E80D /* app */, F861D804207FA4200085E80D /* $mppDirName */,
); );
}; };
/* End PBXProject section */ /* End PBXProject section */
@@ -493,7 +495,7 @@ class ViewController: UIViewController {
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh; shellPath = /bin/sh;
shellScript = "\"${"$"}SRCROOT/../gradlew\" -p \"${"$"}SRCROOT/../app\" copyFramework \\\n-Pconfiguration.build.dir=\"${"$"}CONFIGURATION_BUILD_DIR\" \\\n-Pkotlin.build.type=\"${"$"}KOTLIN_BUILD_TYPE\" \\\n-Pkotlin.target=\"${"$"}KOTLIN_TARGET\""; shellScript = "\"${"$"}SRCROOT/../gradlew\" -p \"${"$"}SRCROOT/../$mppDirName\" copyFramework \\\n-Pconfiguration.build.dir=\"${"$"}CONFIGURATION_BUILD_DIR\" \\\n-Pkotlin.build.type=\"${"$"}KOTLIN_BUILD_TYPE\" \\\n-Pkotlin.target=\"${"$"}KOTLIN_TARGET\"";
}; };
/* End PBXShellScriptBuildPhase section */ /* End PBXShellScriptBuildPhase section */
@@ -525,7 +527,7 @@ class ViewController: UIViewController {
}; };
F861D80B207FA4200085E80D /* PBXTargetDependency */ = { F861D80B207FA4200085E80D /* PBXTargetDependency */ = {
isa = PBXTargetDependency; isa = PBXTargetDependency;
target = F861D804207FA4200085E80D /* app */; target = F861D804207FA4200085E80D /* $mppDirName */;
targetProxy = F861D80A207FA4200085E80D /* PBXContainerItemProxy */; targetProxy = F861D80A207FA4200085E80D /* PBXContainerItemProxy */;
}; };
/* End PBXTargetDependency section */ /* End PBXTargetDependency section */
@@ -724,7 +726,7 @@ class ViewController: UIViewController {
PRODUCT_NAME = "${'$'}(TARGET_NAME)"; PRODUCT_NAME = "${'$'}(TARGET_NAME)";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "${'$'}(BUILT_PRODUCTS_DIR)/iosApp.app/iosApp"; TEST_HOST = "${'$'}(BUILT_PRODUCTS_DIR)/iosApp.$mppDirName/iosApp";
}; };
name = Debug; name = Debug;
}; };
@@ -744,7 +746,7 @@ class ViewController: UIViewController {
PRODUCT_NAME = "${'$'}(TARGET_NAME)"; PRODUCT_NAME = "${'$'}(TARGET_NAME)";
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
TARGETED_DEVICE_FAMILY = "1,2"; TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "${'$'}(BUILT_PRODUCTS_DIR)/iosApp.app/iosApp"; TEST_HOST = "${'$'}(BUILT_PRODUCTS_DIR)/iosApp.$mppDirName/iosApp";
}; };
name = Release; name = Release;
}; };
@@ -769,7 +771,7 @@ class ViewController: UIViewController {
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.example.app; PRODUCT_BUNDLE_IDENTIFIER = com.example.$mppDirName;
PRODUCT_NAME = "${'$'}(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "${'$'}(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
@@ -800,7 +802,7 @@ class ViewController: UIViewController {
"@executable_path/Frameworks", "@executable_path/Frameworks",
"@loader_path/Frameworks", "@loader_path/Frameworks",
); );
PRODUCT_BUNDLE_IDENTIFIER = com.example.app; PRODUCT_BUNDLE_IDENTIFIER = com.example.$mppDirName;
PRODUCT_NAME = "${'$'}(TARGET_NAME:c99extidentifier)"; PRODUCT_NAME = "${'$'}(TARGET_NAME:c99extidentifier)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
SWIFT_VERSION = 4.0; SWIFT_VERSION = 4.0;
@@ -840,7 +842,7 @@ class ViewController: UIViewController {
defaultConfigurationIsVisible = 0; defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release; defaultConfigurationName = Release;
}; };
F861D80E207FA4200085E80D /* Build configuration list for PBXNativeTarget "app" */ = { F861D80E207FA4200085E80D /* Build configuration list for PBXNativeTarget "$mppDirName" */ = {
isa = XCConfigurationList; isa = XCConfigurationList;
buildConfigurations = ( buildConfigurations = (
F861D80F207FA4200085E80D /* Debug */, F861D80F207FA4200085E80D /* Debug */,