Skip to content

Commit

Permalink
fixes and disable logging
Browse files Browse the repository at this point in the history
  • Loading branch information
paulb777 committed Apr 11, 2024
1 parent 0cb1f67 commit e2f6ec1
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 23 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/inappmessaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:
# Don't run on private repo unless it is a PR.
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'

runs-on: macos-14
# TODO: Update to macos-14 when tests are updated for Xcode 15.
runs-on: macos-12
strategy:
matrix:
# TODO(#8682): Reenable iPad after fixing Xcode 13 test failures.
Expand Down
4 changes: 2 additions & 2 deletions FirebaseCoreInternal.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ Pod::Spec.new do |s|
s.test_spec 'Unit' do |unit_tests|
unit_tests.scheme = { :code_coverage => true }
unit_tests.platforms = {
:ios => ios_deployment_target,
:ios => '13.0',
:osx => '10.15',
:tvos => tvos_deployment_target
:tvos => '13.0'
}
unit_tests.source_files = [
'FirebaseCore/Internal/Tests/Unit/**/*.swift',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="2z0-64-rZk">
<rect key="frame" x="0.0" y="222.33333333333334" width="414" height="55.666666666666657"/>
<fontDescription key="fontDescription" type="system" pointSize="11"/>
<state key="normal" title="Wthout Image or Action Button"/>
<state key="normal" title="Without Image or Action Button"/>
<connections>
<action selector="showWithoutImageAndButton:" destination="ttC-lg-4V1" eventType="touchUpInside" id="Sob-M5-UjN"/>
</connections>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ class InAppMessagingDisplayModalViewUITests: InAppMessagingDisplayUITestsBase {
let orientantions = [UIDeviceOrientation.portrait, UIDeviceOrientation.landscapeLeft]
for orientation in orientantions {
XCUIDevice.shared.orientation = orientation
app.buttons["Wthout Image or Action Button"].tap()
app.buttons["Without Image or Action Button"].tap()

waitForElementToAppear(closeButton)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ class InAppMessaging_Example_iOS_SwiftUITests: XCTestCase {
let orientantions = [UIDeviceOrientation.portrait, UIDeviceOrientation.landscapeLeft]
for orientation in orientantions {
XCUIDevice.shared.orientation = orientation
app.buttons["Wthout Image or Action Button"].tap()
app.buttons["Without Image or Action Button"].tap()

waitForElementToAppear(closeButton)

Expand Down
13 changes: 0 additions & 13 deletions SymbolCollisionTest/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,25 @@ target 'SymbolCollisionTest' do
# Other Google Pods
pod 'ARCore'
# pod 'Blockly' `Blockly` does not specify a Swift version ...
# pod 'DigitsMigrationHelper' Dependency Base64 doesn't build in Xcode 15
pod 'EarlGrey'
# pod 'GeoFire' -- requires Firebase/Database 4.0
# pod 'google-cast-sdk' -- abseil
pod 'Google-Mobile-Ads-SDK'
pod 'GoogleAnalytics'
# pod 'GoogleAppIndexing' Fails to build with Xcode 15
pod 'GoogleAppUtilities'
pod 'GoogleAuthUtilities'
# pod 'GoogleConversionTracking' Fails to build with Xcode 15
pod 'GoogleDataTransport'
# pod 'GoogleIDFASupport' Fails to build with Xcode 15
pod 'GoogleInterchangeUtilities'
pod 'GoogleMaps'

# pod 'GoogleMobileVision' # After Firebase 6.8.0, conflicts with FirebaseML
pod 'GoogleNetworkingUtilities'
pod 'GoogleParsingUtilities'
pod 'GooglePlacePicker'
pod 'GooglePlaces'
pod 'GooglePlusUtilities'
pod 'GoogleSignIn', '> 6'
pod 'GTMAppAuth'
pod 'GoogleSymbolUtilities'
pod 'GoogleTagManager'
pod 'GoogleToolboxForMac'
pod 'GoogleUtilities'
# pod 'GTMHTTPFetcher' - conflicts with GTMSessionFetcher
pod 'GTMSessionFetcher'
# pod 'GVRSDK' -- absl and protobuf duplicates
pod 'leveldb-library'
# pod 'MDFTextAccessibility' - conflicts with GVRSDK
pod 'nanopb'
# pod 'NearbyMessages' # - conflicts with google-cast-sdk
pod 'Protobuf'
Expand Down
4 changes: 0 additions & 4 deletions scripts/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ function pod_gen() {
}

set -euo pipefail
set -x

if [[ $# -lt 1 ]]; then
cat 1>&2 <<EOF
Expand Down Expand Up @@ -95,11 +94,8 @@ system=$(uname -s)
case "$system" in
Darwin)
xcode_version=$(xcodebuild -version | grep Xcode)
echo $xcode_version
xcode_version="${xcode_version/Xcode /}"
echo $xcode_version
xcode_major="${xcode_version/.*/}"
echo $xcode_major
;;
*)
xcode_major="0"
Expand Down

0 comments on commit e2f6ec1

Please sign in to comment.