diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt index 08619ebb3ef..77fdcd88c9e 100644 --- a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/kotlin/org/jetbrains/kotlin/gradle/native/CocoaPodsIT.kt @@ -14,6 +14,7 @@ import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Compan import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Companion.POD_INSTALL_TASK_NAME import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Companion.POD_SETUP_BUILD_TASK_NAME import org.jetbrains.kotlin.gradle.plugin.cocoapods.KotlinCocoapodsPlugin.Companion.POD_SPEC_TASK_NAME +import org.jetbrains.kotlin.gradle.testbase.TestVersions import org.jetbrains.kotlin.gradle.transformProjectWithPluginsDsl import org.jetbrains.kotlin.gradle.util.createTempDir import org.jetbrains.kotlin.gradle.util.modify @@ -34,11 +35,6 @@ import kotlin.test.fail private val String.validFrameworkName: String get() = replace('-', '_') -private val invalidTaskNameCharacters = "[/\\\\:<>\"?*|]".toRegex() - -private val String.validTaskName - get() = replace(invalidTaskNameCharacters, "_") - class CocoaPodsIT : BaseGradleIT() { @@ -51,8 +47,8 @@ class CocoaPodsIT : BaseGradleIT() { override fun defaultBuildOptions(): BuildOptions = super.defaultBuildOptions().copy(customEnvironmentVariables = getEnvs()) - private val PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER = "" - private val PODFILE_IMPORT_POD_PLACEHOLDER = "#import_pod_directive" + private val podfileImportDirectivePlaceholder = "" + private val podfileImportPodPlaceholder = "#import_pod_directive" private val cocoapodsSingleKtPod = "native-cocoapods-single" private val cocoapodsMultipleKtPods = "native-cocoapods-multiple" @@ -111,7 +107,9 @@ class CocoaPodsIT : BaseGradleIT() { @Before fun configure() { hooks = CustomHooks() - project = getProjectByName(templateProjectName) + project = getProjectByName(templateProjectName).apply { + preparePodfile("ios-app", ImportMode.FRAMEWORKS) + } } @Test @@ -159,6 +157,27 @@ class CocoaPodsIT : BaseGradleIT() { mapOf("kotlin-library" to "MultiplatformLibrary") ) + @Test + fun testXcodeBuildsWithKotlinLibraryFromRootProject() { + + val project = transformProjectWithPluginsDsl(templateProjectName, GradleVersionRequired.AtLeast(TestVersions.Gradle.G_7_6)) + + project.gradleBuildScript().appendToCocoapodsBlock(""" + framework { + baseName = "kotlin-library" + } + name = "kotlin-library" + podfile = project.file("ios-app/Podfile") + """.trimIndent()) + + doTestXcode( + project, + ImportMode.FRAMEWORKS, + "ios-app", + mapOf("" to null), + ) + } + @Test fun testPodImportSingle() = doTestImportSingle() @@ -1103,11 +1122,6 @@ class CocoaPodsIT : BaseGradleIT() { writeText(text.removeRange(begin..index)) } - private fun File.changePod(podName: String, newConfiguration: String? = null) { - removePod(podName) - addPod(podName, newConfiguration) - } - private fun File.addSpecRepo(specRepo: String) = appendToCocoapodsBlock("url(\"$specRepo\")".wrap("specRepos")) private fun File.appendToKotlinBlock(str: String) = appendLine(str.wrap("kotlin")) @@ -1144,48 +1158,6 @@ class CocoaPodsIT : BaseGradleIT() { // proposition phase - private fun checkTag(gitDir: File, tagName: String) { - runCommand( - gitDir, - "git", "name-rev", - "--tags", - "--name-only", - "HEAD" - ) { - val (retCode, out, errorMessage) = this - assertEquals(0, retCode, errorMessage) - assertTrue(out.contains(tagName), errorMessage) - } - } - - private fun checkPresentCommits(gitDir: File, commitName: String?) { - runCommand( - gitDir, - "git", "log", "--pretty=oneline" - ) { - val (retCode, out, _) = this - assertEquals(0, retCode) - // get rid of '\n' at the end - assertEquals(1, out.trimEnd().lines().size) - if (commitName != null) { - assertEquals(commitName, out.substringBefore(" ")) - } - } - } - - private fun checkBranch(gitDir: File, branchName: String) { - runCommand( - gitDir, - "git", "show-branch" - ) { - val (retCode, out, errorMessage) = this - assertEquals(0, retCode) - // get rid of '\n' at the end - assertEquals(1, out.trimEnd().lines().size, errorMessage) - assertEquals("[$branchName]", out.substringBefore(" "), errorMessage) - } - } - private fun isRepoAvailable(repo: String): Boolean { var responseCode = 0 runCommand( @@ -1325,10 +1297,25 @@ class CocoaPodsIT : BaseGradleIT() { projectName: String, mode: ImportMode, iosAppLocation: String?, - subprojectsToFrameworkNamesMap: Map + subprojectsToFrameworkNamesMap: Map, ) { val gradleProject = transformProjectWithPluginsDsl(projectName, gradleVersion) + doTestXcode( + gradleProject = gradleProject, + mode = mode, + iosAppLocation = iosAppLocation, + subprojectsToFrameworkNamesMap = subprojectsToFrameworkNamesMap, + ) + } + + private fun doTestXcode( + gradleProject: Project, + mode: ImportMode, + iosAppLocation: String?, + subprojectsToFrameworkNamesMap: Map, + ) { + gradleProject.projectDir.resolve("gradle.properties") .takeIf(File::exists) ?.let { @@ -1341,20 +1328,22 @@ class CocoaPodsIT : BaseGradleIT() { for ((subproject, frameworkName) in subprojectsToFrameworkNamesMap) { + val taskPrefix = if (subproject.isNotEmpty()) ":$subproject" else "" + // Add property with custom framework name frameworkName?.let { useCustomFrameworkName(subproject, it, iosAppLocation) } // Generate podspec. - build(":$subproject:podspec", "-Pkotlin.native.cocoapods.generate.wrapper=true") { + build("$taskPrefix:podspec", "-Pkotlin.native.cocoapods.generate.wrapper=true") { assertSuccessful() } iosAppLocation?.also { // Set import mode for Podfile. preparePodfile(it, mode) // Install pods. - build(":$subproject:podInstall", "-Pkotlin.native.cocoapods.generate.wrapper=true") { + build("$taskPrefix:podInstall", "-Pkotlin.native.cocoapods.generate.wrapper=true") { assertSuccessful() } @@ -1392,14 +1381,14 @@ class CocoaPodsIT : BaseGradleIT() { // Set import mode for Podfile. iosAppDir.resolve("Podfile").takeIf { it.exists() }?.modify { - it.replace(PODFILE_IMPORT_DIRECTIVE_PLACEHOLDER, mode.directive) + it.replace(podfileImportDirectivePlaceholder, mode.directive) } } private fun Project.addPodToPodfile(iosAppLocation: String, pod: String) { val iosAppDir = projectDir.resolve(iosAppLocation) iosAppDir.resolve("Podfile").takeIf { it.exists() }?.modify { - it.replace(PODFILE_IMPORT_POD_PLACEHOLDER, "pod '$pod'") + it.replace(podfileImportPodPlaceholder, "pod '$pod'") } } diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/Podfile b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/Podfile new file mode 100644 index 00000000000..ffb2a3e8fdd --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/Podfile @@ -0,0 +1,7 @@ + + +platform :ios, '13.5' + +target 'ios-app' do + pod 'kotlin-library', :path => '../' +end \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.pbxproj b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.pbxproj new file mode 100644 index 00000000000..9d1f7826128 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.pbxproj @@ -0,0 +1,412 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 2C4835762268863D00C928E6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4835752268863D00C928E6 /* AppDelegate.swift */; }; + 2C4835782268863D00C928E6 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4835772268863D00C928E6 /* ViewController.swift */; }; + 2C48357B2268863D00C928E6 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C4835792268863D00C928E6 /* Main.storyboard */; }; + 2C48357D2268863E00C928E6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C48357C2268863E00C928E6 /* Assets.xcassets */; }; + 2C4835802268863E00C928E6 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C48357E2268863E00C928E6 /* LaunchScreen.storyboard */; }; + 7A8FD316CA50E2E8DB0D2E1F /* Pods_ios_app.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 79A90FE0891295265092998A /* Pods_ios_app.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 2C4835722268863D00C928E6 /* ios-app.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ios-app.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2C4835752268863D00C928E6 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 2C4835772268863D00C928E6 /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = ""; }; + 2C48357A2268863D00C928E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; + 2C48357C2268863E00C928E6 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 2C48357F2268863E00C928E6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; + 2C4835812268863E00C928E6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 39AA8CDDA5FAB17AD7272A34 /* Pods-ios-app.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios-app.release.xcconfig"; path = "Target Support Files/Pods-ios-app/Pods-ios-app.release.xcconfig"; sourceTree = ""; }; + 79A90FE0891295265092998A /* Pods_ios_app.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_ios_app.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8897ED03DAD11C439BD35DA2 /* Pods-ios-app.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ios-app.debug.xcconfig"; path = "Target Support Files/Pods-ios-app/Pods-ios-app.debug.xcconfig"; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 2C48356F2268863D00C928E6 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 7A8FD316CA50E2E8DB0D2E1F /* Pods_ios_app.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 2C4835692268863D00C928E6 = { + isa = PBXGroup; + children = ( + 2C4835742268863D00C928E6 /* ios-app */, + 2C4835732268863D00C928E6 /* Products */, + 75B0236CA0D69AB91740F84B /* Pods */, + B503D3AF3A2FD132899BF9C3 /* Frameworks */, + ); + sourceTree = ""; + }; + 2C4835732268863D00C928E6 /* Products */ = { + isa = PBXGroup; + children = ( + 2C4835722268863D00C928E6 /* ios-app.app */, + ); + name = Products; + sourceTree = ""; + }; + 2C4835742268863D00C928E6 /* ios-app */ = { + isa = PBXGroup; + children = ( + 2C4835752268863D00C928E6 /* AppDelegate.swift */, + 2C4835772268863D00C928E6 /* ViewController.swift */, + 2C4835792268863D00C928E6 /* Main.storyboard */, + 2C48357C2268863E00C928E6 /* Assets.xcassets */, + 2C48357E2268863E00C928E6 /* LaunchScreen.storyboard */, + 2C4835812268863E00C928E6 /* Info.plist */, + ); + path = "ios-app"; + sourceTree = ""; + }; + 75B0236CA0D69AB91740F84B /* Pods */ = { + isa = PBXGroup; + children = ( + 8897ED03DAD11C439BD35DA2 /* Pods-ios-app.debug.xcconfig */, + 39AA8CDDA5FAB17AD7272A34 /* Pods-ios-app.release.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; + B503D3AF3A2FD132899BF9C3 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 79A90FE0891295265092998A /* Pods_ios_app.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 2C4835712268863D00C928E6 /* ios-app */ = { + isa = PBXNativeTarget; + buildConfigurationList = 2C4835842268863E00C928E6 /* Build configuration list for PBXNativeTarget "ios-app" */; + buildPhases = ( + 7B4CDBDA6EC98FDDF547B2AA /* [CP] Check Pods Manifest.lock */, + 2C48356E2268863D00C928E6 /* Sources */, + 2C48356F2268863D00C928E6 /* Frameworks */, + 2C4835702268863D00C928E6 /* Resources */, + F845F16848C8A553686D03C2 /* [CP] Embed Pods Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "ios-app"; + productName = "ios-app"; + productReference = 2C4835722268863D00C928E6 /* ios-app.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 2C48356A2268863D00C928E6 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 1020; + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = jetbrains; + TargetAttributes = { + 2C4835712268863D00C928E6 = { + CreatedOnToolsVersion = 10.2; + }; + }; + }; + buildConfigurationList = 2C48356D2268863D00C928E6 /* Build configuration list for PBXProject "ios-app" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 2C4835692268863D00C928E6; + productRefGroup = 2C4835732268863D00C928E6 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 2C4835712268863D00C928E6 /* ios-app */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 2C4835702268863D00C928E6 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2C4835802268863E00C928E6 /* LaunchScreen.storyboard in Resources */, + 2C48357D2268863E00C928E6 /* Assets.xcassets in Resources */, + 2C48357B2268863D00C928E6 /* Main.storyboard in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 7B4CDBDA6EC98FDDF547B2AA /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-ios-app-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; + F845F16848C8A553686D03C2 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ios-app/Pods-ios-app-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-ios-app/Pods-ios-app-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-ios-app/Pods-ios-app-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 2C48356E2268863D00C928E6 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2C4835782268863D00C928E6 /* ViewController.swift in Sources */, + 2C4835762268863D00C928E6 /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + 2C4835792268863D00C928E6 /* Main.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 2C48357A2268863D00C928E6 /* Base */, + ); + name = Main.storyboard; + sourceTree = ""; + }; + 2C48357E2268863E00C928E6 /* LaunchScreen.storyboard */ = { + isa = PBXVariantGroup; + children = ( + 2C48357F2268863E00C928E6 /* Base */, + ); + name = LaunchScreen.storyboard; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 2C4835822268863E00C928E6 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 2C4835832268863E00C928E6 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.2; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 2C4835852268863E00C928E6 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 8897ED03DAD11C439BD35DA2 /* Pods-ios-app.debug.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "ios-app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.konan.ios-app"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 2C4835862268863E00C928E6 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 39AA8CDDA5FAB17AD7272A34 /* Pods-ios-app.release.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_TEAM = ""; + INFOPLIST_FILE = "ios-app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.konan.ios-app"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 2C48356D2268863D00C928E6 /* Build configuration list for PBXProject "ios-app" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2C4835822268863E00C928E6 /* Debug */, + 2C4835832268863E00C928E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 2C4835842268863E00C928E6 /* Build configuration list for PBXNativeTarget "ios-app" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 2C4835852268863E00C928E6 /* Debug */, + 2C4835862268863E00C928E6 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 2C48356A2268863D00C928E6 /* Project object */; +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000000..e69de29bb2d diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000000..18d981003d6 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/AppDelegate.swift b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/AppDelegate.swift new file mode 100644 index 00000000000..f02afea65bf --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/AppDelegate.swift @@ -0,0 +1,34 @@ +import UIKit + +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + + var window: UIWindow? + + func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { + // Override point for customization after application launch. + return true + } + + func applicationWillResignActive(_ application: UIApplication) { + // Sent when the application is about to move from active to inactive state. This can occur for certain types of temporary interruptions (such as an incoming phone call or SMS message) or when the user quits the application and it begins the transition to the background state. + // Use this method to pause ongoing tasks, disable timers, and invalidate graphics rendering callbacks. Games should use this method to pause the game. + } + + func applicationDidEnterBackground(_ application: UIApplication) { + // Use this method to release shared resources, save user data, invalidate timers, and store enough application state information to restore your application to its current state in case it is terminated later. + // If your application supports background execution, this method is called instead of applicationWillTerminate: when the user quits. + } + + func applicationWillEnterForeground(_ application: UIApplication) { + // Called as part of the transition from the background to the active state; here you can undo many of the changes made on entering the background. + } + + func applicationDidBecomeActive(_ application: UIApplication) { + // Restart any tasks that were paused (or not yet started) while the application was inactive. If the application was previously in the background, optionally refresh the user interface. + } + + func applicationWillTerminate(_ application: UIApplication) { + // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:. + } +} diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000000..dfc5acac601 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,98 @@ +{ + "images": [ + { + "idiom": "iphone", + "size": "20x20", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "20x20", + "scale": "3x" + }, + { + "idiom": "iphone", + "size": "29x29", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "29x29", + "scale": "3x" + }, + { + "idiom": "iphone", + "size": "40x40", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "40x40", + "scale": "3x" + }, + { + "idiom": "iphone", + "size": "60x60", + "scale": "2x" + }, + { + "idiom": "iphone", + "size": "60x60", + "scale": "3x" + }, + { + "idiom": "ipad", + "size": "20x20", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "20x20", + "scale": "2x" + }, + { + "idiom": "ipad", + "size": "29x29", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "29x29", + "scale": "2x" + }, + { + "idiom": "ipad", + "size": "40x40", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "40x40", + "scale": "2x" + }, + { + "idiom": "ipad", + "size": "76x76", + "scale": "1x" + }, + { + "idiom": "ipad", + "size": "76x76", + "scale": "2x" + }, + { + "idiom": "ipad", + "size": "83.5x83.5", + "scale": "2x" + }, + { + "idiom": "ios-marketing", + "size": "1024x1024", + "scale": "1x" + } + ], + "info": { + "version": 1, + "author": "xcode" + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/Contents.json b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/Contents.json new file mode 100644 index 00000000000..121dee67a67 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info": { + "version": 1, + "author": "xcode" + } +} \ No newline at end of file diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard new file mode 100644 index 00000000000..bfa36129419 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/LaunchScreen.storyboard @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/Main.storyboard b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/Main.storyboard new file mode 100644 index 00000000000..f1bcf38400d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Base.lproj/Main.storyboard @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Info.plist b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Info.plist new file mode 100644 index 00000000000..16be3b68112 --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/Info.plist @@ -0,0 +1,45 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIMainStoryboardFile + Main + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/ViewController.swift b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/ViewController.swift new file mode 100644 index 00000000000..eb50ae4e75d --- /dev/null +++ b/libraries/tools/kotlin-gradle-plugin-integration-tests/src/test/resources/testProject/native-cocoapods-template/ios-app/ios-app/ViewController.swift @@ -0,0 +1,10 @@ +import UIKit +import kotlin_library + +class ViewController: UIViewController { + override func viewDidLoad() { + super.viewDidLoad() + AKt.foo() + // Do any additional setup after loading the view. + } +} diff --git a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt index 00af0ae8efd..8812fec0c1c 100644 --- a/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt +++ b/libraries/tools/kotlin-gradle-plugin/src/common/kotlin/org/jetbrains/kotlin/gradle/targets/native/tasks/CocoapodsTasks.kt @@ -138,7 +138,7 @@ open class PodspecTask : DefaultTask() { val xcConfig = if (publishing.get() || extraSpecAttributes.get().containsKey("pod_target_xcconfig")) "" else """ | | spec.pod_target_xcconfig = { - | 'KOTLIN_PROJECT_PATH' => '${project.path}', + | 'KOTLIN_PROJECT_PATH' => '${if (project.depth != 0) project.path else ""}', | 'PRODUCT_MODULE_NAME' => '${frameworkName.get()}', | } """.trimMargin()