From e3382dba2afd50f29371bcc99bdfbb0b1c9c62ca Mon Sep 17 00:00:00 2001 From: Nikita Lipsky Date: Fri, 13 Jan 2023 11:02:00 +0200 Subject: [PATCH] Rename xcode projects to iosApp and remove ios run configurations (#2629) --- experimental/examples/chat-mpp/.gitignore | 6 +-- .../.run/iosApp (Android Studio).run.xml | 7 --- .../examples/chat-mpp/.run/iosApp.run.xml | 8 ---- experimental/examples/chat-mpp/README.md | 7 ++- experimental/examples/chat-mpp/iosApp/Podfile | 2 +- .../project.pbxproj | 40 ++++++++-------- experimental/examples/codeviewer/.gitignore | 6 +-- .../examples/codeviewer/.run/iosApp.run.xml | 8 ---- .../examples/codeviewer/.run/iosApp_.run.xml | 7 --- experimental/examples/codeviewer/README.md | 5 +- .../examples/codeviewer/iosApp/Podfile | 2 +- .../project.pbxproj | 46 +++++++++---------- .../examples/falling-balls-mpp/.gitignore | 6 +-- .../falling-balls-mpp/.run/iosApp.run.xml | 8 ---- .../falling-balls-mpp/.run/iosApp_.run.xml | 7 --- .../examples/falling-balls-mpp/README.md | 7 ++- .../examples/falling-balls-mpp/iosApp/Podfile | 2 +- .../project.pbxproj | 40 ++++++++-------- experimental/examples/imageviewer/.gitignore | 6 +-- .../.run/iosApp (AndroidStudio).run.xml | 7 --- .../examples/imageviewer/.run/iosApp.run.xml | 11 ----- experimental/examples/imageviewer/README.md | 7 ++- .../examples/imageviewer/iosApp/Podfile | 2 +- .../project.pbxproj | 46 +++++++++---------- experimental/examples/minesweeper/.gitignore | 6 +-- .../.run/iosApp (Android Studio).run.xml | 7 --- .../examples/minesweeper/.run/iosApp.run.xml | 8 ---- experimental/examples/minesweeper/README.md | 7 ++- .../examples/minesweeper/iosApp/Podfile | 2 +- .../project.pbxproj | 46 +++++++++---------- experimental/examples/todoapp-lite/.gitignore | 6 +-- .../examples/todoapp-lite/.run/iosApp.run.xml | 8 ---- .../todoapp-lite/.run/iosApp_.run.xml | 7 --- experimental/examples/todoapp-lite/README.md | 7 ++- .../examples/todoapp-lite/iosApp/Podfile | 2 +- .../project.pbxproj | 40 ++++++++-------- .../examples/visual-effects/.gitignore | 6 +-- .../.run/iosApp (Android Studio).run.xml | 7 --- .../visual-effects/.run/iosApp.run.xml | 8 ---- .../examples/visual-effects/README.md | 7 ++- .../examples/visual-effects/iosApp/Podfile | 2 +- .../project.pbxproj | 46 +++++++++---------- .../examples/widgets-gallery/.gitignore | 6 +-- .../widgets-gallery/.run/iosApp.run.xml | 8 ---- .../widgets-gallery/.run/iosApp_.run.xml | 7 --- .../examples/widgets-gallery/README.md | 7 ++- .../examples/widgets-gallery/iosApp/Podfile | 2 +- .../project.pbxproj | 46 +++++++++---------- 48 files changed, 230 insertions(+), 361 deletions(-) delete mode 100644 experimental/examples/chat-mpp/.run/iosApp (Android Studio).run.xml delete mode 100644 experimental/examples/chat-mpp/.run/iosApp.run.xml rename experimental/examples/chat-mpp/iosApp/{Chat.xcodeproj => iosApp.xcodeproj}/project.pbxproj (88%) delete mode 100644 experimental/examples/codeviewer/.run/iosApp.run.xml delete mode 100644 experimental/examples/codeviewer/.run/iosApp_.run.xml rename experimental/examples/codeviewer/iosApp/{Codeviewer.xcodeproj => iosApp.xcodeproj}/project.pbxproj (86%) delete mode 100644 experimental/examples/falling-balls-mpp/.run/iosApp.run.xml delete mode 100644 experimental/examples/falling-balls-mpp/.run/iosApp_.run.xml rename experimental/examples/falling-balls-mpp/iosApp/{FallingBalls.xcodeproj => iosApp.xcodeproj}/project.pbxproj (87%) delete mode 100644 experimental/examples/imageviewer/.run/iosApp (AndroidStudio).run.xml delete mode 100644 experimental/examples/imageviewer/.run/iosApp.run.xml rename experimental/examples/imageviewer/iosApp/{Imageviewer.xcodeproj => iosApp.xcodeproj}/project.pbxproj (85%) delete mode 100644 experimental/examples/minesweeper/.run/iosApp (Android Studio).run.xml delete mode 100644 experimental/examples/minesweeper/.run/iosApp.run.xml rename experimental/examples/minesweeper/iosApp/{Minesweeper.xcodeproj => iosApp.xcodeproj}/project.pbxproj (85%) delete mode 100644 experimental/examples/todoapp-lite/.run/iosApp.run.xml delete mode 100644 experimental/examples/todoapp-lite/.run/iosApp_.run.xml rename experimental/examples/todoapp-lite/iosApp/{TodoAppLite.xcodeproj => iosApp.xcodeproj}/project.pbxproj (87%) delete mode 100644 experimental/examples/visual-effects/.run/iosApp (Android Studio).run.xml delete mode 100644 experimental/examples/visual-effects/.run/iosApp.run.xml rename experimental/examples/visual-effects/iosApp/{VisualEffects.xcodeproj => iosApp.xcodeproj}/project.pbxproj (85%) delete mode 100644 experimental/examples/widgets-gallery/.run/iosApp.run.xml delete mode 100644 experimental/examples/widgets-gallery/.run/iosApp_.run.xml rename experimental/examples/widgets-gallery/iosApp/{WidgetsGallery.xcodeproj => iosApp.xcodeproj}/project.pbxproj (85%) diff --git a/experimental/examples/chat-mpp/.gitignore b/experimental/examples/chat-mpp/.gitignore index 74989f6092..ab26a93d32 100644 --- a/experimental/examples/chat-mpp/.gitignore +++ b/experimental/examples/chat-mpp/.gitignore @@ -2,7 +2,7 @@ local.properties .idea iosApp/Podfile.lock iosApp/Pods/* -iosApp/Chat.xcworkspace/* -iosApp/Chat.xcodeproj/* -!iosApp/Chat.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec diff --git a/experimental/examples/chat-mpp/.run/iosApp (Android Studio).run.xml b/experimental/examples/chat-mpp/.run/iosApp (Android Studio).run.xml deleted file mode 100644 index 7db93f44c2..0000000000 --- a/experimental/examples/chat-mpp/.run/iosApp (Android Studio).run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/chat-mpp/.run/iosApp.run.xml b/experimental/examples/chat-mpp/.run/iosApp.run.xml deleted file mode 100644 index 52af717eaf..0000000000 --- a/experimental/examples/chat-mpp/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/chat-mpp/README.md b/experimental/examples/chat-mpp/README.md index e9318eee36..8ac4b08fe0 100644 --- a/experimental/examples/chat-mpp/README.md +++ b/experimental/examples/chat-mpp/README.md @@ -13,11 +13,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/Chat.xcworkspace` and then -using "Signing & Capabilities" tab of `Chat` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `Chat` in the Run Configurations or `iosApp (Android Studio)` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/chat-mpp/iosApp/Podfile b/experimental/examples/chat-mpp/iosApp/Podfile index 34ff925f6a..aff9c517b2 100644 --- a/experimental/examples/chat-mpp/iosApp/Podfile +++ b/experimental/examples/chat-mpp/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'Chat' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/chat-mpp/iosApp/Chat.xcodeproj/project.pbxproj b/experimental/examples/chat-mpp/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 88% rename from experimental/examples/chat-mpp/iosApp/Chat.xcodeproj/project.pbxproj rename to experimental/examples/chat-mpp/iosApp/iosApp.xcodeproj/project.pbxproj index d25847ef19..c9a234c0cf 100644 --- a/experimental/examples/chat-mpp/iosApp/Chat.xcodeproj/project.pbxproj +++ b/experimental/examples/chat-mpp/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_Chat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_Chat.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-Chat.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Chat.debug.xcconfig"; path = "Target Support Files/Pods-Chat/Pods-Chat.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-Chat.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Chat.release.xcconfig"; path = "Target Support Files/Pods-Chat/Pods-Chat.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* Chat.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Chat.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_Chat.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Chat.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_Chat.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_Chat.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-Chat.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-Chat.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* Chat */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Chat" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -102,7 +102,7 @@ ); dependencies = ( ); - name = Chat; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* Chat.app */; productType = "com.apple.product-type.application"; @@ -122,7 +122,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "Chat" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -135,7 +135,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* Chat */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -166,7 +166,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Chat-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -307,7 +307,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-Chat.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -322,7 +322,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Chat${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Chat"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -331,7 +331,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-Chat.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -346,7 +346,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Chat${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Chat"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -356,7 +356,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "Chat" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -365,7 +365,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Chat" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/codeviewer/.gitignore b/experimental/examples/codeviewer/.gitignore index e949f25f51..6e5f30477c 100644 --- a/experimental/examples/codeviewer/.gitignore +++ b/experimental/examples/codeviewer/.gitignore @@ -9,7 +9,7 @@ build/ .cxx iosApp/Podfile.lock iosApp/Pods/* -iosApp/Codeviewer.xcworkspace/* -iosApp/Codeviewer.xcodeproj/* -!iosApp/Codeviewer.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec diff --git a/experimental/examples/codeviewer/.run/iosApp.run.xml b/experimental/examples/codeviewer/.run/iosApp.run.xml deleted file mode 100644 index cb9a3578f1..0000000000 --- a/experimental/examples/codeviewer/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/codeviewer/.run/iosApp_.run.xml b/experimental/examples/codeviewer/.run/iosApp_.run.xml deleted file mode 100644 index b8737d8dd8..0000000000 --- a/experimental/examples/codeviewer/.run/iosApp_.run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/codeviewer/README.md b/experimental/examples/codeviewer/README.md index 6a5b097c67..8f3b2e7efb 100644 --- a/experimental/examples/codeviewer/README.md +++ b/experimental/examples/codeviewer/README.md @@ -8,11 +8,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/Codeviewer.xcworkspace` and then +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then using "Signing & Capabilities" tab of `Codeviewer` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `Codeviewer` in the Run Configurations or `iosApp_` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/codeviewer/iosApp/Podfile b/experimental/examples/codeviewer/iosApp/Podfile index d2bd79b172..aff9c517b2 100644 --- a/experimental/examples/codeviewer/iosApp/Podfile +++ b/experimental/examples/codeviewer/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'Codeviewer' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/codeviewer/iosApp/Codeviewer.xcodeproj/project.pbxproj b/experimental/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 86% rename from experimental/examples/codeviewer/iosApp/Codeviewer.xcodeproj/project.pbxproj rename to experimental/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj index df3eca3e08..2dbe457e0e 100644 --- a/experimental/examples/codeviewer/iosApp/Codeviewer.xcodeproj/project.pbxproj +++ b/experimental/examples/codeviewer/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_Codeviewer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_Codeviewer.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-Codeviewer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Codeviewer.debug.xcconfig"; path = "Target Support Files/Pods-Codeviewer/Pods-Codeviewer.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-Codeviewer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Codeviewer.release.xcconfig"; path = "Target Support Files/Pods-Codeviewer/Pods-Codeviewer.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* Codeviewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Codeviewer.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_Codeviewer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Codeviewer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_Codeviewer.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_Codeviewer.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-Codeviewer.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-Codeviewer.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* Codeviewer */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Codeviewer" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -103,7 +103,7 @@ ); dependencies = ( ); - name = Codeviewer; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* Codeviewer.app */; productType = "com.apple.product-type.application"; @@ -123,7 +123,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "Codeviewer" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -136,7 +136,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* Codeviewer */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -158,15 +158,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Codeviewer/Pods-Codeviewer-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Codeviewer/Pods-Codeviewer-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Codeviewer/Pods-Codeviewer-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */ = { @@ -184,7 +184,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Codeviewer-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -325,7 +325,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-Codeviewer.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -340,7 +340,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Codeviewer${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Codeviewer"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,7 +349,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-Codeviewer.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -364,7 +364,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Codeviewer${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Codeviewer"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -374,7 +374,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "Codeviewer" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -383,7 +383,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Codeviewer" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/falling-balls-mpp/.gitignore b/experimental/examples/falling-balls-mpp/.gitignore index 48f2b8eaf6..968bdd56ce 100644 --- a/experimental/examples/falling-balls-mpp/.gitignore +++ b/experimental/examples/falling-balls-mpp/.gitignore @@ -1,7 +1,7 @@ local.properties iosApp/Podfile.lock iosApp/Pods/* -iosApp/FallingBalls.xcworkspace/* -iosApp/FallingBalls.xcodeproj/* -!iosApp/FallingBalls.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec \ No newline at end of file diff --git a/experimental/examples/falling-balls-mpp/.run/iosApp.run.xml b/experimental/examples/falling-balls-mpp/.run/iosApp.run.xml deleted file mode 100644 index f9c7eeaf3f..0000000000 --- a/experimental/examples/falling-balls-mpp/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/falling-balls-mpp/.run/iosApp_.run.xml b/experimental/examples/falling-balls-mpp/.run/iosApp_.run.xml deleted file mode 100644 index 571065b496..0000000000 --- a/experimental/examples/falling-balls-mpp/.run/iosApp_.run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/falling-balls-mpp/README.md b/experimental/examples/falling-balls-mpp/README.md index aba566ea01..a5ced8f794 100644 --- a/experimental/examples/falling-balls-mpp/README.md +++ b/experimental/examples/falling-balls-mpp/README.md @@ -13,11 +13,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/FallingBalls.xcworkspace` and then -using "Signing & Capabilities" tab of `FallingBalls` target. See also how to prepare XCode section below. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. See also how to prepare XCode section below. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `FallingBalls` in the Run Configurations or `iosApp_` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/falling-balls-mpp/iosApp/Podfile b/experimental/examples/falling-balls-mpp/iosApp/Podfile index f3ae41cd4d..aff9c517b2 100644 --- a/experimental/examples/falling-balls-mpp/iosApp/Podfile +++ b/experimental/examples/falling-balls-mpp/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'FallingBalls' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/falling-balls-mpp/iosApp/FallingBalls.xcodeproj/project.pbxproj b/experimental/examples/falling-balls-mpp/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 87% rename from experimental/examples/falling-balls-mpp/iosApp/FallingBalls.xcodeproj/project.pbxproj rename to experimental/examples/falling-balls-mpp/iosApp/iosApp.xcodeproj/project.pbxproj index 82a4987dcb..623f6b9308 100644 --- a/experimental/examples/falling-balls-mpp/iosApp/FallingBalls.xcodeproj/project.pbxproj +++ b/experimental/examples/falling-balls-mpp/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_FallingBalls.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_FallingBalls.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-FallingBalls.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FallingBalls.debug.xcconfig"; path = "Target Support Files/Pods-FallingBalls/Pods-FallingBalls.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-FallingBalls.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FallingBalls.release.xcconfig"; path = "Target Support Files/Pods-FallingBalls/Pods-FallingBalls.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* FallingBalls.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FallingBalls.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_FallingBalls.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FallingBalls.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_FallingBalls.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_FallingBalls.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-FallingBalls.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-FallingBalls.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* FallingBalls */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "FallingBalls" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -102,7 +102,7 @@ ); dependencies = ( ); - name = FallingBalls; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* FallingBalls.app */; productType = "com.apple.product-type.application"; @@ -122,7 +122,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "FallingBalls" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -135,7 +135,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* FallingBalls */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -166,7 +166,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FallingBalls-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -307,7 +307,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-FallingBalls.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -322,7 +322,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.FallingBalls${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "FallingBalls"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -331,7 +331,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-FallingBalls.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -346,7 +346,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.FallingBalls${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "FallingBalls"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -356,7 +356,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "FallingBalls" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -365,7 +365,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "FallingBalls" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/imageviewer/.gitignore b/experimental/examples/imageviewer/.gitignore index 994fd0a8a4..d27dff7cb0 100644 --- a/experimental/examples/imageviewer/.gitignore +++ b/experimental/examples/imageviewer/.gitignore @@ -15,7 +15,7 @@ build/ .cxx iosApp/Podfile.lock iosApp/Pods/* -iosApp/Imageviewer.xcworkspace/* -iosApp/Imageviewer.xcodeproj/* -!iosApp/Imageviewer.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec diff --git a/experimental/examples/imageviewer/.run/iosApp (AndroidStudio).run.xml b/experimental/examples/imageviewer/.run/iosApp (AndroidStudio).run.xml deleted file mode 100644 index 9784842232..0000000000 --- a/experimental/examples/imageviewer/.run/iosApp (AndroidStudio).run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/imageviewer/.run/iosApp.run.xml b/experimental/examples/imageviewer/.run/iosApp.run.xml deleted file mode 100644 index 3a59900d23..0000000000 --- a/experimental/examples/imageviewer/.run/iosApp.run.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/experimental/examples/imageviewer/README.md b/experimental/examples/imageviewer/README.md index c9fca538d1..e25ea43104 100755 --- a/experimental/examples/imageviewer/README.md +++ b/experimental/examples/imageviewer/README.md @@ -10,11 +10,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/Imageviewer.xcworkspace` and then -using "Signing & Capabilities" tab of `ImageViewer` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `ImageViewer` in the Run Configurations or `iosApp (AndroidStudio)` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/imageviewer/iosApp/Podfile b/experimental/examples/imageviewer/iosApp/Podfile index 5f87c3d554..aff9c517b2 100644 --- a/experimental/examples/imageviewer/iosApp/Podfile +++ b/experimental/examples/imageviewer/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'Imageviewer' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/imageviewer/iosApp/Imageviewer.xcodeproj/project.pbxproj b/experimental/examples/imageviewer/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 85% rename from experimental/examples/imageviewer/iosApp/Imageviewer.xcodeproj/project.pbxproj rename to experimental/examples/imageviewer/iosApp/iosApp.xcodeproj/project.pbxproj index 2e83e0d5ea..2d52838b5e 100644 --- a/experimental/examples/imageviewer/iosApp/Imageviewer.xcodeproj/project.pbxproj +++ b/experimental/examples/imageviewer/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_Imageviewer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_Imageviewer.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-Imageviewer.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Imageviewer.debug.xcconfig"; path = "Target Support Files/Pods-Imageviewer/Pods-Imageviewer.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-Imageviewer.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Imageviewer.release.xcconfig"; path = "Target Support Files/Pods-Imageviewer/Pods-Imageviewer.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* Imageviewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Imageviewer.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_Imageviewer.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Imageviewer.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_Imageviewer.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_Imageviewer.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-Imageviewer.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-Imageviewer.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* Imageviewer */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Imageviewer" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -103,7 +103,7 @@ ); dependencies = ( ); - name = Imageviewer; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* Imageviewer.app */; productType = "com.apple.product-type.application"; @@ -123,7 +123,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "Imageviewer" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -136,7 +136,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* Imageviewer */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -167,7 +167,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Imageviewer-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -180,15 +180,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Imageviewer/Pods-Imageviewer-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Imageviewer/Pods-Imageviewer-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Imageviewer/Pods-Imageviewer-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -325,7 +325,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-Imageviewer.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -340,7 +340,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Imageviewer${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Imageviewer"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,7 +349,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-Imageviewer.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -364,7 +364,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Imageviewer${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Imageviewer"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -374,7 +374,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "Imageviewer" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -383,7 +383,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Imageviewer" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/minesweeper/.gitignore b/experimental/examples/minesweeper/.gitignore index 0903344480..fedf972a67 100644 --- a/experimental/examples/minesweeper/.gitignore +++ b/experimental/examples/minesweeper/.gitignore @@ -1,7 +1,7 @@ local.properties iosApp/Podfile.lock iosApp/Pods/* -iosApp/Minesweeper.xcworkspace/* -iosApp/Minesweeper.xcodeproj/* -!iosApp/Minesweeper.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec diff --git a/experimental/examples/minesweeper/.run/iosApp (Android Studio).run.xml b/experimental/examples/minesweeper/.run/iosApp (Android Studio).run.xml deleted file mode 100644 index 553dd92ab1..0000000000 --- a/experimental/examples/minesweeper/.run/iosApp (Android Studio).run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/minesweeper/.run/iosApp.run.xml b/experimental/examples/minesweeper/.run/iosApp.run.xml deleted file mode 100644 index 31a15653b2..0000000000 --- a/experimental/examples/minesweeper/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/minesweeper/README.md b/experimental/examples/minesweeper/README.md index f03076ebf3..898c1163bd 100644 --- a/experimental/examples/minesweeper/README.md +++ b/experimental/examples/minesweeper/README.md @@ -15,11 +15,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/Minesweeper.xcworkspace` and then -using "Signing & Capabilities" tab of `Minesweeper` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `Minesweeper` in the Run Configurations or `iosApp (Android Studio)` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/minesweeper/iosApp/Podfile b/experimental/examples/minesweeper/iosApp/Podfile index 43dcabd199..aff9c517b2 100644 --- a/experimental/examples/minesweeper/iosApp/Podfile +++ b/experimental/examples/minesweeper/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'Minesweeper' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/minesweeper/iosApp/Minesweeper.xcodeproj/project.pbxproj b/experimental/examples/minesweeper/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 85% rename from experimental/examples/minesweeper/iosApp/Minesweeper.xcodeproj/project.pbxproj rename to experimental/examples/minesweeper/iosApp/iosApp.xcodeproj/project.pbxproj index af3f99d747..17872b50ea 100644 --- a/experimental/examples/minesweeper/iosApp/Minesweeper.xcodeproj/project.pbxproj +++ b/experimental/examples/minesweeper/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_Minesweeper.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_Minesweeper.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-Minesweeper.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Minesweeper.debug.xcconfig"; path = "Target Support Files/Pods-Minesweeper/Pods-Minesweeper.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-Minesweeper.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Minesweeper.release.xcconfig"; path = "Target Support Files/Pods-Minesweeper/Pods-Minesweeper.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* Minesweeper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Minesweeper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_Minesweeper.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Minesweeper.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_Minesweeper.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_Minesweeper.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-Minesweeper.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-Minesweeper.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* Minesweeper */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Minesweeper" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -103,7 +103,7 @@ ); dependencies = ( ); - name = Minesweeper; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* Minesweeper.app */; productType = "com.apple.product-type.application"; @@ -123,7 +123,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "Minesweeper" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -136,7 +136,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* Minesweeper */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -158,15 +158,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Minesweeper/Pods-Minesweeper-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-Minesweeper/Pods-Minesweeper-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Minesweeper/Pods-Minesweeper-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */ = { @@ -184,7 +184,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-Minesweeper-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -325,7 +325,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-Minesweeper.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -340,7 +340,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Minesweeper${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Minesweeper"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,7 +349,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-Minesweeper.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -364,7 +364,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.Minesweeper${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "Minesweeper"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -374,7 +374,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "Minesweeper" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -383,7 +383,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Minesweeper" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/todoapp-lite/.gitignore b/experimental/examples/todoapp-lite/.gitignore index cc4b0964f9..e6c9b61384 100644 --- a/experimental/examples/todoapp-lite/.gitignore +++ b/experimental/examples/todoapp-lite/.gitignore @@ -9,7 +9,7 @@ build/ .cxx iosApp/Podfile.lock iosApp/Pods/* -iosApp/TodoAppLite.xcworkspace/* -iosApp/TodoAppLite.xcodeproj/* -!iosApp/TodoAppLite.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec \ No newline at end of file diff --git a/experimental/examples/todoapp-lite/.run/iosApp.run.xml b/experimental/examples/todoapp-lite/.run/iosApp.run.xml deleted file mode 100644 index df65b2954f..0000000000 --- a/experimental/examples/todoapp-lite/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/todoapp-lite/.run/iosApp_.run.xml b/experimental/examples/todoapp-lite/.run/iosApp_.run.xml deleted file mode 100644 index 6a83a13b6e..0000000000 --- a/experimental/examples/todoapp-lite/.run/iosApp_.run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/todoapp-lite/README.md b/experimental/examples/todoapp-lite/README.md index 8aae04a387..ff7d9e2f0f 100755 --- a/experimental/examples/todoapp-lite/README.md +++ b/experimental/examples/todoapp-lite/README.md @@ -11,11 +11,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/TodoAppLite.xcworkspace` and then -using "Signing & Capabilities" tab of `TodoAppLite` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `TodoAppLite` in the Run Configurations or `iosApp_` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/todoapp-lite/iosApp/Podfile b/experimental/examples/todoapp-lite/iosApp/Podfile index 14d09a9b6f..aff9c517b2 100644 --- a/experimental/examples/todoapp-lite/iosApp/Podfile +++ b/experimental/examples/todoapp-lite/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'TodoAppLite' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/todoapp-lite/iosApp/TodoAppLite.xcodeproj/project.pbxproj b/experimental/examples/todoapp-lite/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 87% rename from experimental/examples/todoapp-lite/iosApp/TodoAppLite.xcodeproj/project.pbxproj rename to experimental/examples/todoapp-lite/iosApp/iosApp.xcodeproj/project.pbxproj index 7bc383c90b..90dbd7bdaf 100644 --- a/experimental/examples/todoapp-lite/iosApp/TodoAppLite.xcodeproj/project.pbxproj +++ b/experimental/examples/todoapp-lite/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_TodoAppLite.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_TodoAppLite.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-TodoAppLite.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TodoAppLite.debug.xcconfig"; path = "Target Support Files/Pods-TodoAppLite/Pods-TodoAppLite.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-TodoAppLite.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TodoAppLite.release.xcconfig"; path = "Target Support Files/Pods-TodoAppLite/Pods-TodoAppLite.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* TodoAppLite.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TodoAppLite.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_TodoAppLite.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TodoAppLite.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_TodoAppLite.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_TodoAppLite.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-TodoAppLite.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-TodoAppLite.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* TodoAppLite */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "TodoAppLite" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -102,7 +102,7 @@ ); dependencies = ( ); - name = TodoAppLite; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* TodoAppLite.app */; productType = "com.apple.product-type.application"; @@ -122,7 +122,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "TodoAppLite" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -135,7 +135,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* TodoAppLite */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -166,7 +166,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-TodoAppLite-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -307,7 +307,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-TodoAppLite.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -322,7 +322,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.TodoAppLite${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "TodoAppLite"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -331,7 +331,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-TodoAppLite.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -346,7 +346,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.TodoAppLite${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "TodoAppLite"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -356,7 +356,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "TodoAppLite" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -365,7 +365,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "TodoAppLite" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/visual-effects/.gitignore b/experimental/examples/visual-effects/.gitignore index 89610cae77..180e034383 100644 --- a/experimental/examples/visual-effects/.gitignore +++ b/experimental/examples/visual-effects/.gitignore @@ -15,7 +15,7 @@ build/ .cxx iosApp/Podfile.lock iosApp/Pods/* -iosApp/VisualEffects.xcworkspace/* -iosApp/VisualEffects.xcodeproj/* -!iosApp/VisualEffects.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec \ No newline at end of file diff --git a/experimental/examples/visual-effects/.run/iosApp (Android Studio).run.xml b/experimental/examples/visual-effects/.run/iosApp (Android Studio).run.xml deleted file mode 100644 index 8f17976841..0000000000 --- a/experimental/examples/visual-effects/.run/iosApp (Android Studio).run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/visual-effects/.run/iosApp.run.xml b/experimental/examples/visual-effects/.run/iosApp.run.xml deleted file mode 100644 index 0100cd0080..0000000000 --- a/experimental/examples/visual-effects/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/visual-effects/README.md b/experimental/examples/visual-effects/README.md index 0af5e7bfa5..8adffa9f90 100644 --- a/experimental/examples/visual-effects/README.md +++ b/experimental/examples/visual-effects/README.md @@ -13,11 +13,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/VisualEffects.xcworkspace` and then -using "Signing & Capabilities" tab of `VisualEffects` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `VisualEffects` in the Run Configurations or `iosApp (Android Studio)` for Android Studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/visual-effects/iosApp/Podfile b/experimental/examples/visual-effects/iosApp/Podfile index f374c908fa..aff9c517b2 100644 --- a/experimental/examples/visual-effects/iosApp/Podfile +++ b/experimental/examples/visual-effects/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'VisualEffects' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/visual-effects/iosApp/VisualEffects.xcodeproj/project.pbxproj b/experimental/examples/visual-effects/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 85% rename from experimental/examples/visual-effects/iosApp/VisualEffects.xcodeproj/project.pbxproj rename to experimental/examples/visual-effects/iosApp/iosApp.xcodeproj/project.pbxproj index 78104d8efd..cf6c635c60 100644 --- a/experimental/examples/visual-effects/iosApp/VisualEffects.xcodeproj/project.pbxproj +++ b/experimental/examples/visual-effects/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_VisualEffects.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_VisualEffects.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-VisualEffects.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VisualEffects.debug.xcconfig"; path = "Target Support Files/Pods-VisualEffects/Pods-VisualEffects.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-VisualEffects.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-VisualEffects.release.xcconfig"; path = "Target Support Files/Pods-VisualEffects/Pods-VisualEffects.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* VisualEffects.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = VisualEffects.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_VisualEffects.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_VisualEffects.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_VisualEffects.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_VisualEffects.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-VisualEffects.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-VisualEffects.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* VisualEffects */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "VisualEffects" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -103,7 +103,7 @@ ); dependencies = ( ); - name = VisualEffects; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* VisualEffects.app */; productType = "com.apple.product-type.application"; @@ -123,7 +123,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "VisualEffects" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -136,7 +136,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* VisualEffects */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -158,15 +158,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-VisualEffects/Pods-VisualEffects-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-VisualEffects/Pods-VisualEffects-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-VisualEffects/Pods-VisualEffects-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */ = { @@ -184,7 +184,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-VisualEffects-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -325,7 +325,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-VisualEffects.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -340,7 +340,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.VisualEffects${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "VisualEffects"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,7 +349,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-VisualEffects.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -364,7 +364,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.VisualEffects${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "VisualEffects"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -374,7 +374,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "VisualEffects" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -383,7 +383,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "VisualEffects" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */, diff --git a/experimental/examples/widgets-gallery/.gitignore b/experimental/examples/widgets-gallery/.gitignore index 6ce3e8de8e..e6c9b61384 100644 --- a/experimental/examples/widgets-gallery/.gitignore +++ b/experimental/examples/widgets-gallery/.gitignore @@ -9,7 +9,7 @@ build/ .cxx iosApp/Podfile.lock iosApp/Pods/* -iosApp/WidgetsGallery.xcworkspace/* -iosApp/WidgetsGallery.xcodeproj/* -!iosApp/WidgetsGallery.xcodeproj/project.pbxproj +iosApp/iosApp.xcworkspace/* +iosApp/iosApp.xcodeproj/* +!iosApp/iosApp.xcodeproj/project.pbxproj shared/shared.podspec \ No newline at end of file diff --git a/experimental/examples/widgets-gallery/.run/iosApp.run.xml b/experimental/examples/widgets-gallery/.run/iosApp.run.xml deleted file mode 100644 index 9a44c1ee71..0000000000 --- a/experimental/examples/widgets-gallery/.run/iosApp.run.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/experimental/examples/widgets-gallery/.run/iosApp_.run.xml b/experimental/examples/widgets-gallery/.run/iosApp_.run.xml deleted file mode 100644 index 8c18b8b909..0000000000 --- a/experimental/examples/widgets-gallery/.run/iosApp_.run.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/experimental/examples/widgets-gallery/README.md b/experimental/examples/widgets-gallery/README.md index 9f9cda5fd9..7b275f4b90 100644 --- a/experimental/examples/widgets-gallery/README.md +++ b/experimental/examples/widgets-gallery/README.md @@ -15,11 +15,10 @@ Choose a run configuration for an appropriate target in IDE and run it. ![run-configurations.png](run-configurations.png) To run on iOS device, please correct `iosApp/Configuration/TeamId.xcconfig` with your Apple Team ID. -Alternatively, you may setup signing within XCode opening `iosApp/WidgetsGallery.xcworkspace` and then -using "Signing & Capabilities" tab of `WidgetsGallery` target. +Alternatively, you may setup signing within XCode opening `iosApp/iosApp.xcworkspace` and then +using "Signing & Capabilities" tab of `iosApp` target. -Then choose **iosApp** configuration in IDE and run it -(may also be referred as `WidgetsGallery` in the Run Configurations or `iosApp_` for Android studio). +Then choose **iosApp** configuration in IDE and run it. ## Run on desktop via Gradle diff --git a/experimental/examples/widgets-gallery/iosApp/Podfile b/experimental/examples/widgets-gallery/iosApp/Podfile index 7ac5a5cc38..aff9c517b2 100644 --- a/experimental/examples/widgets-gallery/iosApp/Podfile +++ b/experimental/examples/widgets-gallery/iosApp/Podfile @@ -1,4 +1,4 @@ -target 'WidgetsGallery' do +target 'iosApp' do use_frameworks! platform :ios, '14.1' pod 'shared', :path => '../shared' diff --git a/experimental/examples/widgets-gallery/iosApp/WidgetsGallery.xcodeproj/project.pbxproj b/experimental/examples/widgets-gallery/iosApp/iosApp.xcodeproj/project.pbxproj similarity index 85% rename from experimental/examples/widgets-gallery/iosApp/WidgetsGallery.xcodeproj/project.pbxproj rename to experimental/examples/widgets-gallery/iosApp/iosApp.xcodeproj/project.pbxproj index 9def370c18..ce77d0e217 100644 --- a/experimental/examples/widgets-gallery/iosApp/WidgetsGallery.xcodeproj/project.pbxproj +++ b/experimental/examples/widgets-gallery/iosApp/iosApp.xcodeproj/project.pbxproj @@ -8,16 +8,16 @@ /* Begin PBXBuildFile section */ 2152FB042600AC8F00CF470E /* iosApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iosApp.swift */; }; - C1FC908188C4E8695729CB06 /* Pods_WidgetsGallery.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_WidgetsGallery.framework */; }; + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 1EB65E27D2C0F884D0A1A133 /* Pods-WidgetsGallery.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WidgetsGallery.debug.xcconfig"; path = "Target Support Files/Pods-WidgetsGallery/Pods-WidgetsGallery.debug.xcconfig"; sourceTree = ""; }; + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; 2152FB032600AC8F00CF470E /* iosApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iosApp.swift; sourceTree = ""; }; - 3D7A606AB0AD7636269BD9D0 /* Pods-WidgetsGallery.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WidgetsGallery.release.xcconfig"; path = "Target Support Files/Pods-WidgetsGallery/Pods-WidgetsGallery.release.xcconfig"; sourceTree = ""; }; + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = ""; }; 7555FF7B242A565900829871 /* WidgetsGallery.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WidgetsGallery.app; sourceTree = BUILT_PRODUCTS_DIR; }; 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 8DE96E47030356CE6AD9794A /* Pods_WidgetsGallery.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_WidgetsGallery.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; AB3632DC29227652001CCB65 /* TeamId.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = TeamId.xcconfig; sourceTree = ""; }; /* End PBXFileReference section */ @@ -26,7 +26,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C1FC908188C4E8695729CB06 /* Pods_WidgetsGallery.framework in Frameworks */, + C1FC908188C4E8695729CB06 /* Pods_iosApp.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,7 +72,7 @@ B62309C7396AD7BF607A63B2 /* Frameworks */ = { isa = PBXGroup; children = ( - 8DE96E47030356CE6AD9794A /* Pods_WidgetsGallery.framework */, + 8DE96E47030356CE6AD9794A /* Pods_iosApp.framework */, ); name = Frameworks; sourceTree = ""; @@ -80,8 +80,8 @@ E1DAFBE8E1CFC0878361EF0E /* Pods */ = { isa = PBXGroup; children = ( - 1EB65E27D2C0F884D0A1A133 /* Pods-WidgetsGallery.debug.xcconfig */, - 3D7A606AB0AD7636269BD9D0 /* Pods-WidgetsGallery.release.xcconfig */, + 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */, + 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -89,9 +89,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 7555FF7A242A565900829871 /* WidgetsGallery */ = { + 7555FF7A242A565900829871 /* iosApp */ = { isa = PBXNativeTarget; - buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "WidgetsGallery" */; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; buildPhases = ( E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */, 7555FF77242A565900829871 /* Sources */, @@ -103,7 +103,7 @@ ); dependencies = ( ); - name = WidgetsGallery; + name = iosApp; productName = iosApp; productReference = 7555FF7B242A565900829871 /* WidgetsGallery.app */; productType = "com.apple.product-type.application"; @@ -123,7 +123,7 @@ }; }; }; - buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "WidgetsGallery" */; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -136,7 +136,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 7555FF7A242A565900829871 /* WidgetsGallery */, + 7555FF7A242A565900829871 /* iosApp */, ); }; /* End PBXProject section */ @@ -158,15 +158,15 @@ files = ( ); inputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WidgetsGallery/Pods-WidgetsGallery-resources-${CONFIGURATION}-input-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-input-files.xcfilelist", ); name = "[CP] Copy Pods Resources"; outputFileListPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-WidgetsGallery/Pods-WidgetsGallery-resources-${CONFIGURATION}-output-files.xcfilelist", + "${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources-${CONFIGURATION}-output-files.xcfilelist", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-WidgetsGallery/Pods-WidgetsGallery-resources.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-resources.sh\"\n"; showEnvVarsInLog = 0; }; E8D673591E7196AEA2EA10E2 /* [CP] Check Pods Manifest.lock */ = { @@ -184,7 +184,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-WidgetsGallery-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -325,7 +325,7 @@ }; 7555FFA6242A565B00829871 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-WidgetsGallery.debug.xcconfig */; + baseConfigurationReference = 1EB65E27D2C0F884D0A1A133 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -340,7 +340,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.WidgetsGallery${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "WidgetsGallery"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -349,7 +349,7 @@ }; 7555FFA7242A565B00829871 /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-WidgetsGallery.release.xcconfig */; + baseConfigurationReference = 3D7A606AB0AD7636269BD9D0 /* Pods-iosApp.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; @@ -364,7 +364,7 @@ "@executable_path/Frameworks", ); PRODUCT_BUNDLE_IDENTIFIER = "org.jetbrains.WidgetsGallery${TEAM_ID}"; - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "WidgetsGallery"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -374,7 +374,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 7555FF76242A565900829871 /* Build configuration list for PBXProject "WidgetsGallery" */ = { + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA3242A565B00829871 /* Debug */, @@ -383,7 +383,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "WidgetsGallery" */ = { + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 7555FFA6242A565B00829871 /* Debug */,