Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NO JIRA] Bumps iOS agent to '7.4.9' #193

Merged
merged 22 commits into from
Jan 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e4c1bdd
Merge pull request #153 from newrelic/develop
cdillard-NewRelic Sep 26, 2023
169e81b
[7.4.7-rc.589] Staging Release
cdillard-NewRelic Sep 26, 2023
fdaec87
do cocoapods, then swift pm
cdillard-NewRelic Sep 28, 2023
021bb1d
Merge pull request #156 from newrelic/747prod
cdillard-NewRelic Oct 2, 2023
52251d1
push SPM change for 7.4.7
cdillard-NewRelic Oct 2, 2023
9e1d783
Branching from the main for beta tests (#133)
mbruin-NR Oct 2, 2023
71c95be
[7.4.7] Production Release (#159)
github-actions[bot] Oct 3, 2023
622ec3b
Merge branch 'staging' of github.com:newrelic/newrelic-ios-agent into…
cdillard-NewRelic Nov 20, 2023
b6565e3
Merge pull request #185 from newrelic/stage748
cdillard-NewRelic Nov 21, 2023
9c84aa1
[7.4.8-rc.710] Staging Release
cdillard-NewRelic Nov 21, 2023
7356d29
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into pr…
cdillard-NewRelic Nov 27, 2023
d3a8f81
Merge pull request #187 from newrelic/prod748
cdillard-NewRelic Nov 27, 2023
9a7637d
Include Prod Podspec Job by default in productionDeploy
cdillard-NewRelic Nov 27, 2023
03f581b
Merge pull request #188 from newrelic/includeCpInProductionDeploy
cdillard-NewRelic Nov 27, 2023
daa3f04
[create-pull-request] automated change
cdillard-NewRelic Dec 11, 2023
a44828a
Merge pull request #191 from newrelic/auto-production-release-7.4.8
cdillard-NewRelic Dec 13, 2023
27e4c3b
Bump to v749
cdillard-NewRelic Jan 3, 2024
925b344
try remving Gemfile.lock changes
cdillard-NewRelic Jan 3, 2024
b52d269
try bumping xcode v
cdillard-NewRelic Jan 4, 2024
4ef1e20
try fix fastlane v
cdillard-NewRelic Jan 4, 2024
991d012
lower xcode v
cdillard-NewRelic Jan 4, 2024
79d60ee
Merge branch 'develop' into bump749
cdillard-NewRelic Jan 4, 2024
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
20 changes: 10 additions & 10 deletions .github/workflows/productionDeploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
56 changes: 28 additions & 28 deletions Agent.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -5104,10 +5104,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (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;
Expand Down Expand Up @@ -5179,10 +5179,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (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;
Expand Down Expand Up @@ -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 = (
Expand All @@ -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 = "";
Expand Down Expand Up @@ -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)",
Expand All @@ -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 = "";
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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}/**",
Expand Down Expand Up @@ -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}/**",
Expand Down Expand Up @@ -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 = (
Expand All @@ -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;
Expand All @@ -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 = (
Expand All @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source 'https://rubygems.org'

gem "fastlane"
gem "fastlane", '2.216.0'
4 changes: 2 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ PLATFORMS
universal-darwin-22

DEPENDENCIES
fastlane
fastlane (= 2.216.0)

BUNDLED WITH
2.4.19
2.4.22
4 changes: 2 additions & 2 deletions NewRelicAgent.podspec
Original file line number Diff line number Diff line change
@@ -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." => "[email protected]" }
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"
Expand Down
4 changes: 2 additions & 2 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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")
]
)

Loading