From 0d876ec81ac171fbfd60f580130342fea0389bbc Mon Sep 17 00:00:00 2001 From: Chris Dillard <103527346+cdillard-NewRelic@users.noreply.github.com> Date: Fri, 5 Jan 2024 08:41:30 -0700 Subject: [PATCH] [NO JIRA] Bumps iOS agent to '7.4.9' (#193) * [7.4.7-rc.589] Staging Release * do cocoapods, then swift pm * push SPM change for 7.4.7 * Branching from the main for beta tests (#133) * Branching from the main for beta tests * This should fix the tvOS beta not being found * Added tvOS app tests * Added a step to the app unit tests to add a secret api key * Fixed some typos * [7.4.7] Production Release (#159) * [create-pull-request] automated change * Fix auto-prod PR to include Cocoapod spec update --------- Co-authored-by: cdillard-NewRelic Co-authored-by: Chris Dillard * [7.4.8-rc.710] Staging Release * Include Prod Podspec Job by default in productionDeploy * [create-pull-request] automated change * Bump to v749 * try remving Gemfile.lock changes * try bumping xcode v * try fix fastlane v * lower xcode v --------- Co-authored-by: cdillard-NewRelic Co-authored-by: mbruin-NR <118208503+mbruin-NR@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .github/workflows/productionDeploy.yml | 20 ++++----- Agent.xcodeproj/project.pbxproj | 56 +++++++++++++------------- Gemfile | 2 +- Gemfile.lock | 4 +- NewRelicAgent.podspec | 4 +- Package.swift | 4 +- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/.github/workflows/productionDeploy.yml b/.github/workflows/productionDeploy.yml index 8f36358c..e34f3c5d 100644 --- a/.github/workflows/productionDeploy.yml +++ b/.github/workflows/productionDeploy.yml @@ -66,19 +66,19 @@ jobs: - name: Print XCFramework name run: echo "${{ env.version }}" - # - name: Create Prod Podspec for XCFramework version - # run: | - # cd main + - name: Create Prod Podspec for XCFramework version + run: | + cd main - # cp cocoapods/NewRelicAgent.podspec.template NewRelicAgent.podspec - # REPLACE=X.XX - # sed -i bak "s/$REPLACE/${{ env.version }}/g" NewRelicAgent.podspec + cp cocoapods/NewRelicAgent.podspec.template NewRelicAgent.podspec + REPLACE=X.XX + sed -i bak "s/$REPLACE/${{ env.version }}/g" NewRelicAgent.podspec - # rm NewRelicAgent.podspecbak + rm NewRelicAgent.podspecbak - # pod trunk push --allow-warnings NewRelicAgent.podspec - # env: - # COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} + pod trunk push --allow-warnings NewRelicAgent.podspec + env: + COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }} - name: Create Prod Package.swift for XCFramework version run: | diff --git a/Agent.xcodeproj/project.pbxproj b/Agent.xcodeproj/project.pbxproj index df51d1e3..c3e25a74 100644 --- a/Agent.xcodeproj/project.pbxproj +++ b/Agent.xcodeproj/project.pbxproj @@ -4976,9 +4976,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = RQZ9D969HD; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; @@ -5029,9 +5029,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = SU7SUNGZJP; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES; @@ -5104,10 +5104,10 @@ CODE_SIGN_IDENTITY = "Apple Development: cdillard@newrelic.com (3ZGR4484Y2)"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEBUG_INFORMATION_FORMAT = dwarf; DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = c99; @@ -5179,10 +5179,10 @@ CODE_SIGN_IDENTITY = "Apple Development: cdillard@newrelic.com (3ZGR4484Y2)"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = c99; @@ -5223,12 +5223,12 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 7.4.8; + CURRENT_PROJECT_VERSION = 7.4.9; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SU7SUNGZJP; "DEVELOPMENT_TEAM[sdk=macosx*]" = SU7SUNGZJP; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7.4.8; + DYLIB_CURRENT_VERSION = 7.4.9; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -5252,7 +5252,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 7.4.8; + MARKETING_VERSION = 7.4.9; MODULEMAP_FILE = agent.modulemap; OTHER_CFLAGS = "$(inherited"; OTHER_LDFLAGS = ""; @@ -5283,11 +5283,11 @@ "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution: New Relic Inc (SU7SUNGZJP)"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 7.4.8; + CURRENT_PROJECT_VERSION = 7.4.9; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SU7SUNGZJP; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7.4.8; + DYLIB_CURRENT_VERSION = 7.4.9; DYLIB_INSTALL_NAME_BASE = "@rpath"; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", @@ -5309,7 +5309,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 7.4.8; + MARKETING_VERSION = 7.4.9; MODULEMAP_FILE = agent.modulemap; OTHER_CFLAGS = "$(inherited"; OTHER_LDFLAGS = ""; @@ -5334,9 +5334,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = RQZ9D969HD; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks", @@ -5391,9 +5391,9 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_ENABLE_MODULES = YES; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = SU7SUNGZJP; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; FRAMEWORK_SEARCH_PATHS = ( "$(inherited)", "$(PROJECT_DIR)/Frameworks", @@ -5440,9 +5440,9 @@ CLANG_ENABLE_CODE_COVERAGE = YES; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = SU7SUNGZJP; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; HEADER_SEARCH_PATHS = ( "${PROJECT_DIR}/UnitTests/", "${SRCROOT}/**", @@ -5479,9 +5479,9 @@ CLANG_ENABLE_CODE_COVERAGE = YES; "CODE_SIGN_IDENTITY[sdk=macosx*]" = "-"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 7.4.7; + CURRENT_PROJECT_VERSION = 7.4.9; DEVELOPMENT_TEAM = SU7SUNGZJP; - DYLIB_CURRENT_VERSION = 7.4.7; + DYLIB_CURRENT_VERSION = 7.4.9; HEADER_SEARCH_PATHS = ( "${PROJECT_DIR}/UnitTests/", "${SRCROOT}/**", @@ -5519,12 +5519,12 @@ "CODE_SIGN_IDENTITY[sdk=appletvos*]" = "Apple Development"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 7.4.8; + CURRENT_PROJECT_VERSION = 7.4.9; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SU7SUNGZJP; "DEVELOPMENT_TEAM[sdk=appletvos*]" = SU7SUNGZJP; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7.4.8; + DYLIB_CURRENT_VERSION = 7.4.9; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -5546,7 +5546,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 7.4.8; + MARKETING_VERSION = 7.4.9; MODULEMAP_FILE = agent.modulemap; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent; @@ -5572,11 +5572,11 @@ CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)"; CODE_SIGN_STYLE = Manual; COPY_PHASE_STRIP = YES; - CURRENT_PROJECT_VERSION = 7.4.8; + CURRENT_PROJECT_VERSION = 7.4.9; DEFINES_MODULE = YES; DEVELOPMENT_TEAM = SU7SUNGZJP; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 7.4.8; + DYLIB_CURRENT_VERSION = 7.4.9; DYLIB_INSTALL_NAME_BASE = "@rpath"; ENABLE_BITCODE = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -5597,7 +5597,7 @@ "@executable_path/Frameworks", "@loader_path/Frameworks", ); - MARKETING_VERSION = 7.4.8; + MARKETING_VERSION = 7.4.9; MODULEMAP_FILE = agent.modulemap; OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent; diff --git a/Gemfile b/Gemfile index fbfd3ad5..71a26aad 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,3 @@ source 'https://rubygems.org' -gem "fastlane" \ No newline at end of file +gem "fastlane", '2.216.0' \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index aeba6072..4066ab81 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ PLATFORMS universal-darwin-22 DEPENDENCIES - fastlane + fastlane (= 2.216.0) BUNDLED WITH - 2.4.19 + 2.4.22 diff --git a/NewRelicAgent.podspec b/NewRelicAgent.podspec index 4a04aa33..2056c890 100644 --- a/NewRelicAgent.podspec +++ b/NewRelicAgent.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "NewRelicAgent" - s.version = "7.4.7-rc.589" + s.version = "7.4.8" s.summary = "Real-time performance data with your next iOS app release." s.homepage = "http://newrelic.com/mobile-monitoring" s.license = { :type => "Commercial", :file => "LICENSE" } s.author = { "New Relic, Inc." => "support@newrelic.com" } - s.source = { :http => "https://download.newrelic.com/ios-v5/NewRelic_XCFramework_Agent_7.4.7-rc.589.zip" } + s.source = { :http => "https://download.newrelic.com/ios_agent/NewRelic_XCFramework_Agent_7.4.8.zip" } s.ios.deployment_target = '9.0' s.tvos.deployment_target = '9.0' s.vendored_frameworks = "NewRelic.xcframework" diff --git a/Package.swift b/Package.swift index 9422c70d..10ed37e1 100644 --- a/Package.swift +++ b/Package.swift @@ -19,8 +19,8 @@ let package = Package( name: "NewRelicPackage", dependencies: []), .binaryTarget(name: "NewRelic", - url: "https://download.newrelic.com/ios-v5/NewRelic_XCFramework_Agent_7.4.7-rc.589.zip", - checksum: "4d5b8b8415d7e4d98fc12f1bf78347fe4f52c85bea0660be96c17d2a1a705752") + url: "https://download.newrelic.com/ios_agent/NewRelic_XCFramework_Agent_7.4.8.zip", + checksum: "96af08369f21b7c4b6b9ca5ea20d78752445f02d0223c44694012ad19530eba6") ] )