Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
containerPortal = 866138502CC943DD00F4B78E /* Project object */;
proxyType = 1;
remoteGlobalIDString = 866138572CC943DD00F4B78E;
remoteInfo = VertexAITestApp;
remoteInfo = FirebaseAITestApp;
};
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
862218802D04E08D007ED2D4 /* IntegrationTestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTestUtils.swift; sourceTree = "<group>"; };
864F8F702D4980D60002EA7E /* ImagenIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagenIntegrationTests.swift; sourceTree = "<group>"; };
866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VertexAITestApp-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; };
866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseAITestApp-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; };
8661385B2CC943DD00F4B78E /* TestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestApp.swift; sourceTree = "<group>"; };
8661385D2CC943DD00F4B78E /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IntegrationTests-SPM.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
Expand Down Expand Up @@ -100,7 +100,7 @@
866138592CC943DD00F4B78E /* Products */ = {
isa = PBXGroup;
children = (
866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */,
866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */,
866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */,
);
name = Products;
Expand Down Expand Up @@ -173,9 +173,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
866138572CC943DD00F4B78E /* VertexAITestApp-SPM */ = {
866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */ = {
isa = PBXNativeTarget;
buildConfigurationList = 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "VertexAITestApp-SPM" */;
buildConfigurationList = 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "FirebaseAITestApp-SPM" */;
buildPhases = (
866138542CC943DD00F4B78E /* Sources */,
866138552CC943DD00F4B78E /* Frameworks */,
Expand All @@ -185,15 +185,15 @@
);
dependencies = (
);
name = "VertexAITestApp-SPM";
name = "FirebaseAITestApp-SPM";
packageProductDependencies = (
86E8505A2DBAFBC3002E8D94 /* FirebaseAI */,
86E8505C2DBAFBC3002E8D94 /* FirebaseAppCheck */,
86E8505E2DBAFBC3002E8D94 /* FirebaseAuth */,
86E850602DBAFBC3002E8D94 /* FirebaseStorage */,
);
productName = VertexAITestApp;
productReference = 866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */;
productName = FirebaseAITestApp;
productReference = 866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */;
productType = "com.apple.product-type.application";
};
866138682CC943DE00F4B78E /* IntegrationTests-SPM */ = {
Expand All @@ -210,7 +210,7 @@
8661386B2CC943DE00F4B78E /* PBXTargetDependency */,
);
name = "IntegrationTests-SPM";
productName = VertexAITestAppTests;
productName = FirebaseAITestAppTests;
productReference = 866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
Expand All @@ -233,7 +233,7 @@
};
};
};
buildConfigurationList = 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "VertexAITestApp" */;
buildConfigurationList = 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "FirebaseAITestApp" */;
compatibilityVersion = "Xcode 15.0";
developmentRegion = en;
hasScannedForEncodings = 0;
Expand All @@ -249,7 +249,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
866138572CC943DD00F4B78E /* VertexAITestApp-SPM */,
866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */,
866138682CC943DE00F4B78E /* IntegrationTests-SPM */,
);
};
Expand Down Expand Up @@ -310,7 +310,7 @@
/* Begin PBXTargetDependency section */
8661386B2CC943DE00F4B78E /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 866138572CC943DD00F4B78E /* VertexAITestApp-SPM */;
target = 866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */;
targetProxy = 8661386A2CC943DE00F4B78E /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
Expand Down Expand Up @@ -459,8 +459,8 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestApp;
PRODUCT_MODULE_NAME = VertexAITestApp;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestApp;
PRODUCT_MODULE_NAME = FirebaseAITestApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
Expand Down Expand Up @@ -497,8 +497,8 @@
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestApp;
PRODUCT_MODULE_NAME = VertexAITestApp;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestApp;
PRODUCT_MODULE_NAME = FirebaseAITestApp;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
Expand All @@ -519,14 +519,14 @@
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestAppTests;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VertexAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/VertexAITestApp-SPM";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FirebaseAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/FirebaseAITestApp-SPM";
};
name = Debug;
};
Expand All @@ -541,21 +541,21 @@
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestAppTests;
PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestAppTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = NO;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VertexAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/VertexAITestApp-SPM";
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FirebaseAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/FirebaseAITestApp-SPM";
};
name = Release;
};
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
866138532CC943DD00F4B78E /* Build configuration list for PBXProject "VertexAITestApp" */ = {
866138532CC943DD00F4B78E /* Build configuration list for PBXProject "FirebaseAITestApp" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8661387B2CC943DE00F4B78E /* Debug */,
Expand All @@ -564,7 +564,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "VertexAITestApp-SPM" */ = {
8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "FirebaseAITestApp-SPM" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8661387E2CC943DE00F4B78E /* Debug */,
Expand All @@ -587,7 +587,7 @@
/* Begin XCLocalSwiftPackageReference section */
86E850592DBAFBC3002E8D94 /* XCLocalSwiftPackageReference "../../.." */ = {
isa = XCLocalSwiftPackageReference;
relativePath = "../../..";
relativePath = ../../..;
};
/* End XCLocalSwiftPackageReference section */

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1630"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "866138572CC943DD00F4B78E"
BuildableName = "FirebaseAITestApp-SPM.app"
BlueprintName = "FirebaseAITestApp-SPM"
ReferencedContainer = "container:FirebaseAITestApp.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
<Testables>
<TestableReference
skipped = "NO"
parallelizable = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "866138682CC943DE00F4B78E"
BuildableName = "IntegrationTests-SPM.xctest"
BlueprintName = "IntegrationTests-SPM"
ReferencedContainer = "container:FirebaseAITestApp.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "866138572CC943DD00F4B78E"
BuildableName = "FirebaseAITestApp-SPM.app"
BlueprintName = "FirebaseAITestApp-SPM"
ReferencedContainer = "container:FirebaseAITestApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<CommandLineArguments>
<CommandLineArgument
argument = "-FIRDebugEnabled"
isEnabled = "YES">
</CommandLineArgument>
</CommandLineArguments>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "866138572CC943DD00F4B78E"
BuildableName = "FirebaseAITestApp-SPM.app"
BlueprintName = "FirebaseAITestApp-SPM"
ReferencedContainer = "container:FirebaseAITestApp.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseAuth
import FirebaseCore
import FirebaseStorage
import Testing
import VertexAITestApp

@testable import struct FirebaseAI.APIConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseAuth
import FirebaseCore
import FirebaseStorage
import Testing
import VertexAITestApp

#if canImport(UIKit)
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseAuth
import FirebaseCore
import FirebaseStorage
import Testing
import VertexAITestApp

#if canImport(UIKit)
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseAuth
import FirebaseCore
import FirebaseStorage
import VertexAITestApp
import XCTest

// TODO(#14405): Migrate to Swift Testing and parameterize tests to run on both `v1` and `v1beta`.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseAuth
import FirebaseCore
import FirebaseStorage
import Testing
import VertexAITestApp

#if canImport(UIKit)
import UIKit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
// limitations under the License.

import FirebaseAI
import FirebaseAITestApp
import FirebaseCore
import Testing
import VertexAITestApp

@testable import struct FirebaseAI.APIConfig

Expand Down
8 changes: 4 additions & 4 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -510,15 +510,15 @@ case "$product-$platform-$method" in
FirebaseAIIntegration-*-*)
# Build
RunXcodebuild \
-project 'FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj' \
-scheme "VertexAITestApp-SPM" \
-project 'FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj' \
-scheme "FirebaseAITestApp-SPM" \
"${xcb_flags[@]}" \
build

# Run tests
RunXcodebuild \
-project 'FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj' \
-scheme "VertexAITestApp-SPM" \
-project 'FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj' \
-scheme "FirebaseAITestApp-SPM" \
"${xcb_flags[@]}" \
-parallel-testing-enabled NO \
test
Expand Down
Loading