From d6464b7576fbb8eb3c1c0aa45e9573ef90163ea2 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Tue, 2 Apr 2024 07:45:50 -0800 Subject: [PATCH] [VertexAI] Consolidate to single sample app (#12662) --- .../Sample/ChatSample/ChatSampleApp.swift | 36 -- .../GenerativeAIMultimodalSampleApp.swift | 31 -- .../project.pbxproj | 483 ------------------ .../GenerativeAITextSampleApp.swift | 31 -- 4 files changed, 581 deletions(-) delete mode 100644 FirebaseVertexAI/Sample/ChatSample/ChatSampleApp.swift delete mode 100644 FirebaseVertexAI/Sample/GenerativeAIMultimodalSample/GenerativeAIMultimodalSampleApp.swift delete mode 100644 FirebaseVertexAI/Sample/GenerativeAITextSample/GenerativeAITextSampleApp.swift diff --git a/FirebaseVertexAI/Sample/ChatSample/ChatSampleApp.swift b/FirebaseVertexAI/Sample/ChatSample/ChatSampleApp.swift deleted file mode 100644 index 7d7e02d7e3cf..000000000000 --- a/FirebaseVertexAI/Sample/ChatSample/ChatSampleApp.swift +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import FirebaseCore -import FirebaseVertexAI -import SwiftUI - -@main -struct ChatSampleApp: App { - @StateObject - var viewModel = ConversationViewModel() - - init() { - FirebaseApp.configure() - } - - var body: some Scene { - WindowGroup { - NavigationStack { - ConversationScreen() - .environmentObject(viewModel) - } - } - } -} diff --git a/FirebaseVertexAI/Sample/GenerativeAIMultimodalSample/GenerativeAIMultimodalSampleApp.swift b/FirebaseVertexAI/Sample/GenerativeAIMultimodalSample/GenerativeAIMultimodalSampleApp.swift deleted file mode 100644 index 49565de52d1a..000000000000 --- a/FirebaseVertexAI/Sample/GenerativeAIMultimodalSample/GenerativeAIMultimodalSampleApp.swift +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import FirebaseCore -import SwiftUI - -@main -struct GenerativeAIMultimodalSampleApp: App { - init() { - FirebaseApp.configure() - } - - var body: some Scene { - WindowGroup { - NavigationStack { - PhotoReasoningScreen() - } - } - } -} diff --git a/FirebaseVertexAI/Sample/GenerativeAISample.xcodeproj/project.pbxproj b/FirebaseVertexAI/Sample/GenerativeAISample.xcodeproj/project.pbxproj index 9efade7342d3..ac930a76d954 100644 --- a/FirebaseVertexAI/Sample/GenerativeAISample.xcodeproj/project.pbxproj +++ b/FirebaseVertexAI/Sample/GenerativeAISample.xcodeproj/project.pbxproj @@ -9,34 +9,13 @@ /* Begin PBXBuildFile section */ 868A33662BB476FA00304BB1 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = 868A33652BB476FA00304BB1 /* FirebaseAppCheck */; }; 868A33682BB476FA00304BB1 /* FirebaseVertexAI-Preview in Frameworks */ = {isa = PBXBuildFile; productRef = 868A33672BB476FA00304BB1 /* FirebaseVertexAI-Preview */; }; - 868A336A2BB4771900304BB1 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = 868A33692BB4771900304BB1 /* FirebaseAppCheck */; }; - 868A336C2BB4771900304BB1 /* FirebaseVertexAI-Preview in Frameworks */ = {isa = PBXBuildFile; productRef = 868A336B2BB4771900304BB1 /* FirebaseVertexAI-Preview */; }; - 868A336E2BB4773600304BB1 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = 868A336D2BB4773600304BB1 /* FirebaseAppCheck */; }; - 868A33702BB4773600304BB1 /* FirebaseVertexAI-Preview in Frameworks */ = {isa = PBXBuildFile; productRef = 868A336F2BB4773600304BB1 /* FirebaseVertexAI-Preview */; }; - 868A33722BB4775D00304BB1 /* FirebaseAppCheck in Frameworks */ = {isa = PBXBuildFile; productRef = 868A33712BB4775D00304BB1 /* FirebaseAppCheck */; }; - 868A33742BB4775D00304BB1 /* FirebaseVertexAI-Preview in Frameworks */ = {isa = PBXBuildFile; productRef = 868A33732BB4775D00304BB1 /* FirebaseVertexAI-Preview */; }; 869200B32B879C4F00482873 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 869200B22B879C4F00482873 /* GoogleService-Info.plist */; }; - 869200B42B879C4F00482873 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 869200B22B879C4F00482873 /* GoogleService-Info.plist */; }; - 869200B52B879C4F00482873 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 869200B22B879C4F00482873 /* GoogleService-Info.plist */; }; - 869200B62B879C4F00482873 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 869200B22B879C4F00482873 /* GoogleService-Info.plist */; }; - 880266762B0FC39000CF7CB6 /* PhotoReasoningViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8802666F2B0FC39000CF7CB6 /* PhotoReasoningViewModel.swift */; }; - 880266792B0FC39000CF7CB6 /* PhotoReasoningScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 880266752B0FC39000CF7CB6 /* PhotoReasoningScreen.swift */; }; - 88209C1F2B0FBDC300F64795 /* SummarizeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1B2B0FBDC300F64795 /* SummarizeScreen.swift */; }; - 88209C202B0FBDC300F64795 /* SummarizeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1D2B0FBDC300F64795 /* SummarizeViewModel.swift */; }; - 88209C242B0FBE1700F64795 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 88209C232B0FBE1700F64795 /* MarkdownUI */; }; - 88263BEF2B239BFE008AB09B /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88263BEE2B239BFE008AB09B /* ErrorView.swift */; }; 88263BF02B239C09008AB09B /* ErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88263BEE2B239BFE008AB09B /* ErrorView.swift */; }; 88263BF12B239C11008AB09B /* ErrorDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 889873842B208563005B4896 /* ErrorDetailsView.swift */; }; 8848C8332B0D04BC007B434F /* GenerativeAISampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8848C8322B0D04BC007B434F /* GenerativeAISampleApp.swift */; }; 8848C8352B0D04BC007B434F /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8848C8342B0D04BC007B434F /* ContentView.swift */; }; 8848C8372B0D04BD007B434F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C8362B0D04BD007B434F /* Assets.xcassets */; }; 8848C83A2B0D04BD007B434F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C8392B0D04BD007B434F /* Preview Assets.xcassets */; }; - 8848C8472B0D051E007B434F /* GenerativeAITextSampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8848C8462B0D051E007B434F /* GenerativeAITextSampleApp.swift */; }; - 8848C84B2B0D051F007B434F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C84A2B0D051F007B434F /* Assets.xcassets */; }; - 8848C84E2B0D051F007B434F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C84D2B0D051F007B434F /* Preview Assets.xcassets */; }; - 8848C8592B0D056C007B434F /* GenerativeAIMultimodalSampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8848C8582B0D056C007B434F /* GenerativeAIMultimodalSampleApp.swift */; }; - 8848C85D2B0D056D007B434F /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C85C2B0D056D007B434F /* Assets.xcassets */; }; - 8848C8602B0D056D007B434F /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8848C85F2B0D056D007B434F /* Preview Assets.xcassets */; }; 886F95D52B17BA010036F07A /* SummarizeScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1B2B0FBDC300F64795 /* SummarizeScreen.swift */; }; 886F95D62B17BA010036F07A /* SummarizeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88209C1D2B0FBDC300F64795 /* SummarizeViewModel.swift */; }; 886F95D82B17BA420036F07A /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 886F95D72B17BA420036F07A /* MarkdownUI */; }; @@ -48,19 +27,6 @@ 886F95E02B17D5010036F07A /* ConversationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F562B1112F600C08E95 /* ConversationViewModel.swift */; }; 886F95E12B17D5010036F07A /* ConversationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F542B1112CA00C08E95 /* ConversationScreen.swift */; }; 886F95E32B17D6630036F07A /* GenerativeAIUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 886F95E22B17D6630036F07A /* GenerativeAIUIComponents */; }; - 889873852B208563005B4896 /* ErrorDetailsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 889873842B208563005B4896 /* ErrorDetailsView.swift */; }; - 88B8A91E2B0FC55100424728 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 88B8A91D2B0FC55100424728 /* MarkdownUI */; }; - 88B8A9372B0FCBE700424728 /* GenerativeAIUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = 88B8A9362B0FCBE700424728 /* GenerativeAIUIComponents */; }; - 88D9474D2B14F27E008B5580 /* MarkdownUI in Frameworks */ = {isa = PBXBuildFile; productRef = 88D9474C2B14F27E008B5580 /* MarkdownUI */; }; - 88E10F452B110D5300C08E95 /* ChatSampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F442B110D5300C08E95 /* ChatSampleApp.swift */; }; - 88E10F492B110D5400C08E95 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 88E10F482B110D5400C08E95 /* Assets.xcassets */; }; - 88E10F4C2B110D5400C08E95 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 88E10F4B2B110D5400C08E95 /* Preview Assets.xcassets */; }; - 88E10F552B1112CA00C08E95 /* ConversationScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F542B1112CA00C08E95 /* ConversationScreen.swift */; }; - 88E10F572B1112F600C08E95 /* ConversationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F562B1112F600C08E95 /* ConversationViewModel.swift */; }; - 88E10F592B11131900C08E95 /* ChatMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F582B11131900C08E95 /* ChatMessage.swift */; }; - 88E10F5B2B11133E00C08E95 /* MessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F5A2B11133E00C08E95 /* MessageView.swift */; }; - 88E10F5D2B11135000C08E95 /* BouncingDots.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88E10F5C2B11135000C08E95 /* BouncingDots.swift */; }; - CB0DFFD52B2B4F08006E109D /* GenerativeAIUIComponents in Frameworks */ = {isa = PBXBuildFile; productRef = CB0DFFD42B2B4F08006E109D /* GenerativeAIUIComponents */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ @@ -75,18 +41,12 @@ 8848C8342B0D04BC007B434F /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 8848C8362B0D04BD007B434F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 8848C8392B0D04BD007B434F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 8848C8442B0D051E007B434F /* GenerativeAITextSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GenerativeAITextSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8848C8462B0D051E007B434F /* GenerativeAITextSampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerativeAITextSampleApp.swift; sourceTree = ""; }; 8848C84A2B0D051F007B434F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 8848C84D2B0D051F007B434F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 8848C8562B0D056C007B434F /* GenerativeAIMultimodalSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GenerativeAIMultimodalSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 8848C8582B0D056C007B434F /* GenerativeAIMultimodalSampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GenerativeAIMultimodalSampleApp.swift; sourceTree = ""; }; 8848C85C2B0D056D007B434F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 8848C85F2B0D056D007B434F /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 889873842B208563005B4896 /* ErrorDetailsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorDetailsView.swift; sourceTree = ""; }; 88B8A9352B0FCBA700424728 /* GenerativeAIUIComponents */ = {isa = PBXFileReference; lastKnownFileType = wrapper; path = GenerativeAIUIComponents; sourceTree = ""; }; - 88E10F422B110D5300C08E95 /* ChatSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ChatSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 88E10F442B110D5300C08E95 /* ChatSampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ChatSampleApp.swift; sourceTree = ""; }; 88E10F482B110D5400C08E95 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 88E10F4B2B110D5400C08E95 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 88E10F542B1112CA00C08E95 /* ConversationScreen.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConversationScreen.swift; sourceTree = ""; }; @@ -108,38 +68,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8848C8412B0D051E007B434F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 868A336C2BB4771900304BB1 /* FirebaseVertexAI-Preview in Frameworks */, - 868A336A2BB4771900304BB1 /* FirebaseAppCheck in Frameworks */, - 88209C242B0FBE1700F64795 /* MarkdownUI in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8848C8532B0D056C007B434F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 868A33702BB4773600304BB1 /* FirebaseVertexAI-Preview in Frameworks */, - 88B8A91E2B0FC55100424728 /* MarkdownUI in Frameworks */, - 868A336E2BB4773600304BB1 /* FirebaseAppCheck in Frameworks */, - 88B8A9372B0FCBE700424728 /* GenerativeAIUIComponents in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 88E10F3F2B110D5300C08E95 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 868A33742BB4775D00304BB1 /* FirebaseVertexAI-Preview in Frameworks */, - 88D9474D2B14F27E008B5580 /* MarkdownUI in Frameworks */, - 868A33722BB4775D00304BB1 /* FirebaseAppCheck in Frameworks */, - CB0DFFD52B2B4F08006E109D /* GenerativeAIUIComponents in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -200,9 +128,6 @@ isa = PBXGroup; children = ( 8848C82F2B0D04BC007B434F /* GenerativeAISample.app */, - 8848C8442B0D051E007B434F /* GenerativeAITextSample.app */, - 8848C8562B0D056C007B434F /* GenerativeAIMultimodalSample.app */, - 88E10F422B110D5300C08E95 /* ChatSample.app */, ); name = Products; sourceTree = ""; @@ -231,7 +156,6 @@ children = ( 88209C1C2B0FBDC300F64795 /* ViewModels */, 88209C1A2B0FBDC300F64795 /* Screens */, - 8848C8462B0D051E007B434F /* GenerativeAITextSampleApp.swift */, 8848C84A2B0D051F007B434F /* Assets.xcassets */, 8848C84C2B0D051F007B434F /* Preview Content */, ); @@ -251,7 +175,6 @@ children = ( 8802666E2B0FC39000CF7CB6 /* ViewModels */, 880266742B0FC39000CF7CB6 /* Screens */, - 8848C8582B0D056C007B434F /* GenerativeAIMultimodalSampleApp.swift */, 8848C85C2B0D056D007B434F /* Assets.xcassets */, 8848C85E2B0D056D007B434F /* Preview Content */, ); @@ -273,7 +196,6 @@ 88E10F502B11123600C08E95 /* ViewModels */, 88E10F512B11124100C08E95 /* Views */, 88E10F532B1112B900C08E95 /* Screens */, - 88E10F442B110D5300C08E95 /* ChatSampleApp.swift */, 88E10F482B110D5400C08E95 /* Assets.xcassets */, 88E10F4A2B110D5400C08E95 /* Preview Content */, ); @@ -349,74 +271,6 @@ productReference = 8848C82F2B0D04BC007B434F /* GenerativeAISample.app */; productType = "com.apple.product-type.application"; }; - 8848C8432B0D051E007B434F /* GenerativeAITextSample */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8848C84F2B0D051F007B434F /* Build configuration list for PBXNativeTarget "GenerativeAITextSample" */; - buildPhases = ( - 8848C8402B0D051E007B434F /* Sources */, - 8848C8412B0D051E007B434F /* Frameworks */, - 8848C8422B0D051E007B434F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = GenerativeAITextSample; - packageProductDependencies = ( - 88209C232B0FBE1700F64795 /* MarkdownUI */, - 868A33692BB4771900304BB1 /* FirebaseAppCheck */, - 868A336B2BB4771900304BB1 /* FirebaseVertexAI-Preview */, - ); - productName = GenerativeAITextSample; - productReference = 8848C8442B0D051E007B434F /* GenerativeAITextSample.app */; - productType = "com.apple.product-type.application"; - }; - 8848C8552B0D056C007B434F /* GenerativeAIMultimodalSample */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8848C8612B0D056D007B434F /* Build configuration list for PBXNativeTarget "GenerativeAIMultimodalSample" */; - buildPhases = ( - 8848C8522B0D056C007B434F /* Sources */, - 8848C8532B0D056C007B434F /* Frameworks */, - 8848C8542B0D056C007B434F /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = GenerativeAIMultimodalSample; - packageProductDependencies = ( - 88B8A91D2B0FC55100424728 /* MarkdownUI */, - 88B8A9362B0FCBE700424728 /* GenerativeAIUIComponents */, - 868A336D2BB4773600304BB1 /* FirebaseAppCheck */, - 868A336F2BB4773600304BB1 /* FirebaseVertexAI-Preview */, - ); - productName = GenerativeAIMultimodalSample; - productReference = 8848C8562B0D056C007B434F /* GenerativeAIMultimodalSample.app */; - productType = "com.apple.product-type.application"; - }; - 88E10F412B110D5300C08E95 /* ChatSample */ = { - isa = PBXNativeTarget; - buildConfigurationList = 88E10F4F2B110D5400C08E95 /* Build configuration list for PBXNativeTarget "ChatSample" */; - buildPhases = ( - 88E10F3E2B110D5300C08E95 /* Sources */, - 88E10F3F2B110D5300C08E95 /* Frameworks */, - 88E10F402B110D5300C08E95 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = ChatSample; - packageProductDependencies = ( - 88D9474C2B14F27E008B5580 /* MarkdownUI */, - CB0DFFD42B2B4F08006E109D /* GenerativeAIUIComponents */, - 868A33712BB4775D00304BB1 /* FirebaseAppCheck */, - 868A33732BB4775D00304BB1 /* FirebaseVertexAI-Preview */, - ); - productName = ChatSample; - productReference = 88E10F422B110D5300C08E95 /* ChatSample.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -430,15 +284,6 @@ 8848C82E2B0D04BC007B434F = { CreatedOnToolsVersion = 15.1; }; - 8848C8432B0D051E007B434F = { - CreatedOnToolsVersion = 15.1; - }; - 8848C8552B0D056C007B434F = { - CreatedOnToolsVersion = 15.1; - }; - 88E10F412B110D5300C08E95 = { - CreatedOnToolsVersion = 15.1; - }; }; }; buildConfigurationList = 8848C82A2B0D04BC007B434F /* Build configuration list for PBXProject "GenerativeAISample" */; @@ -460,9 +305,6 @@ projectRoot = ""; targets = ( 8848C82E2B0D04BC007B434F /* GenerativeAISample */, - 8848C8432B0D051E007B434F /* GenerativeAITextSample */, - 8848C8552B0D056C007B434F /* GenerativeAIMultimodalSample */, - 88E10F412B110D5300C08E95 /* ChatSample */, ); }; /* End PBXProject section */ @@ -478,36 +320,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8848C8422B0D051E007B434F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8848C84E2B0D051F007B434F /* Preview Assets.xcassets in Resources */, - 8848C84B2B0D051F007B434F /* Assets.xcassets in Resources */, - 869200B42B879C4F00482873 /* GoogleService-Info.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8848C8542B0D056C007B434F /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 8848C8602B0D056D007B434F /* Preview Assets.xcassets in Resources */, - 8848C85D2B0D056D007B434F /* Assets.xcassets in Resources */, - 869200B52B879C4F00482873 /* GoogleService-Info.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 88E10F402B110D5300C08E95 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 88E10F4C2B110D5400C08E95 /* Preview Assets.xcassets in Resources */, - 88E10F492B110D5400C08E95 /* Assets.xcassets in Resources */, - 869200B62B879C4F00482873 /* GoogleService-Info.plist in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -531,41 +343,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8848C8402B0D051E007B434F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 88209C1F2B0FBDC300F64795 /* SummarizeScreen.swift in Sources */, - 8848C8472B0D051E007B434F /* GenerativeAITextSampleApp.swift in Sources */, - 88209C202B0FBDC300F64795 /* SummarizeViewModel.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 8848C8522B0D056C007B434F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 880266762B0FC39000CF7CB6 /* PhotoReasoningViewModel.swift in Sources */, - 880266792B0FC39000CF7CB6 /* PhotoReasoningScreen.swift in Sources */, - 8848C8592B0D056C007B434F /* GenerativeAIMultimodalSampleApp.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 88E10F3E2B110D5300C08E95 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 88E10F5B2B11133E00C08E95 /* MessageView.swift in Sources */, - 88E10F572B1112F600C08E95 /* ConversationViewModel.swift in Sources */, - 88E10F552B1112CA00C08E95 /* ConversationScreen.swift in Sources */, - 88E10F592B11131900C08E95 /* ChatMessage.swift in Sources */, - 88E10F5D2B11135000C08E95 /* BouncingDots.swift in Sources */, - 88E10F452B110D5300C08E95 /* ChatSampleApp.swift in Sources */, - 88263BEF2B239BFE008AB09B /* ErrorView.swift in Sources */, - 889873852B208563005B4896 /* ErrorDetailsView.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -748,192 +525,6 @@ }; name = Release; }; - 8848C8502B0D051F007B434F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"GenerativeAITextSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.GenerativeAITextSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 8848C8512B0D051F007B434F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"GenerativeAITextSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.GenerativeAITextSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 8848C8622B0D056D007B434F /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"GenerativeAIMultimodalSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.GenerativeAIMultimodalSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 8848C8632B0D056D007B434F /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"GenerativeAIMultimodalSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.GenerativeAIMultimodalSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - 88E10F4D2B110D5400C08E95 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ChatSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.ChatSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 88E10F4E2B110D5400C08E95 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ChatSample/Preview Content\""; - DEVELOPMENT_TEAM = ""; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SCRIPT_SANDBOXING = NO; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES; - INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; - INFOPLIST_KEY_UILaunchScreen_Generation = YES; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.example.google.generativeai.ChatSample; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -955,33 +546,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8848C84F2B0D051F007B434F /* Build configuration list for PBXNativeTarget "GenerativeAITextSample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8848C8502B0D051F007B434F /* Debug */, - 8848C8512B0D051F007B434F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 8848C8612B0D056D007B434F /* Build configuration list for PBXNativeTarget "GenerativeAIMultimodalSample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8848C8622B0D056D007B434F /* Debug */, - 8848C8632B0D056D007B434F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 88E10F4F2B110D5400C08E95 /* Build configuration list for PBXNativeTarget "ChatSample" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 88E10F4D2B110D5400C08E95 /* Debug */, - 88E10F4E2B110D5400C08E95 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCLocalSwiftPackageReference section */ @@ -1019,35 +583,6 @@ isa = XCSwiftPackageProductDependency; productName = "FirebaseVertexAI-Preview"; }; - 868A33692BB4771900304BB1 /* FirebaseAppCheck */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAppCheck; - }; - 868A336B2BB4771900304BB1 /* FirebaseVertexAI-Preview */ = { - isa = XCSwiftPackageProductDependency; - productName = "FirebaseVertexAI-Preview"; - }; - 868A336D2BB4773600304BB1 /* FirebaseAppCheck */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAppCheck; - }; - 868A336F2BB4773600304BB1 /* FirebaseVertexAI-Preview */ = { - isa = XCSwiftPackageProductDependency; - productName = "FirebaseVertexAI-Preview"; - }; - 868A33712BB4775D00304BB1 /* FirebaseAppCheck */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAppCheck; - }; - 868A33732BB4775D00304BB1 /* FirebaseVertexAI-Preview */ = { - isa = XCSwiftPackageProductDependency; - productName = "FirebaseVertexAI-Preview"; - }; - 88209C232B0FBE1700F64795 /* MarkdownUI */ = { - isa = XCSwiftPackageProductDependency; - package = 88209C212B0FBDF700F64795 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */; - productName = MarkdownUI; - }; 886F95D72B17BA420036F07A /* MarkdownUI */ = { isa = XCSwiftPackageProductDependency; package = 88209C212B0FBDF700F64795 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */; @@ -1057,24 +592,6 @@ isa = XCSwiftPackageProductDependency; productName = GenerativeAIUIComponents; }; - 88B8A91D2B0FC55100424728 /* MarkdownUI */ = { - isa = XCSwiftPackageProductDependency; - package = 88209C212B0FBDF700F64795 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */; - productName = MarkdownUI; - }; - 88B8A9362B0FCBE700424728 /* GenerativeAIUIComponents */ = { - isa = XCSwiftPackageProductDependency; - productName = GenerativeAIUIComponents; - }; - 88D9474C2B14F27E008B5580 /* MarkdownUI */ = { - isa = XCSwiftPackageProductDependency; - package = 88209C212B0FBDF700F64795 /* XCRemoteSwiftPackageReference "swift-markdown-ui" */; - productName = MarkdownUI; - }; - CB0DFFD42B2B4F08006E109D /* GenerativeAIUIComponents */ = { - isa = XCSwiftPackageProductDependency; - productName = GenerativeAIUIComponents; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 8848C8272B0D04BC007B434F /* Project object */; diff --git a/FirebaseVertexAI/Sample/GenerativeAITextSample/GenerativeAITextSampleApp.swift b/FirebaseVertexAI/Sample/GenerativeAITextSample/GenerativeAITextSampleApp.swift deleted file mode 100644 index c800e1f7be80..000000000000 --- a/FirebaseVertexAI/Sample/GenerativeAITextSample/GenerativeAITextSampleApp.swift +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2023 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -import FirebaseCore -import SwiftUI - -@main -struct GenerativeAITextSampleApp: App { - init() { - FirebaseApp.configure() - } - - var body: some Scene { - WindowGroup { - NavigationStack { - SummarizeScreen() - } - } - } -}