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

Main 7.5.2 -> Develop #312

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
ec65b5a
Merge pull request #219 from newrelic/staging
smalsam-newr Mar 21, 2024
e501a94
[create-pull-request] automated change
smalsam-newr Mar 21, 2024
a6fea93
Merge pull request #222 from newrelic/auto-production-release-7.4.10
smalsam-newr Mar 21, 2024
095c02e
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into pr…
cdillard-NewRelic Apr 25, 2024
27af526
Merge pull request #234 from newrelic/prod7411
cdillard-NewRelic Apr 29, 2024
b5ea84f
[create-pull-request] automated change (#235)
github-actions[bot] Apr 30, 2024
d6d88da
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into pr…
cdillard-NewRelic May 28, 2024
9bfce72
Merge pull request #253 from newrelic/prod7412
cdillard-NewRelic May 29, 2024
a9b8ab7
[create-pull-request] automated change
cdillard-NewRelic May 29, 2024
9e1a24f
Merge pull request #254 from newrelic/auto-production-release-7.4.12
cdillard-NewRelic May 29, 2024
ae8e415
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into pr…
cdillard-NewRelic Jun 27, 2024
e80fc0b
Merge pull request #272 from newrelic/prod75
cdillard-NewRelic Jun 27, 2024
5373d16
[create-pull-request] automated change
cdillard-NewRelic Jun 28, 2024
05f7ae1
Merge pull request #274 from newrelic/auto-production-release-7.5.0
cdillard-NewRelic Jun 28, 2024
d76054c
Merge branch 'main' of github.com:newrelic/newrelic-ios-agent into pr…
cdillard-NewRelic Aug 20, 2024
2ddcdd1
Merge pull request #288 from newrelic/prod751
cdillard-NewRelic Aug 20, 2024
16972b5
Use macos-13 and xcode 14.3 for now w prod
cdillard-NewRelic Aug 20, 2024
3d10d8f
rem codecov in prod for now
cdillard-NewRelic Aug 20, 2024
2a5de9f
Merge pull request #289 from newrelic/mainGhaFix
cdillard-NewRelic Aug 20, 2024
d34c40f
[create-pull-request] automated change
cdillard-NewRelic Aug 21, 2024
15f0e14
Merge pull request #291 from newrelic/auto-production-release-7.5.1
cdillard-NewRelic Aug 21, 2024
4194aaf
Bump main branch swift package tools to 5.9 (#294)
cdillard-NewRelic Aug 21, 2024
e4bda15
Develop -> Staging 7.5.2 (#308)
mbruin-NR Sep 24, 2024
eb52ed6
[7.5.2-rc.1133] Staging Release
mbruin-NR Sep 24, 2024
439cb6e
Merge branch 'main' into staging
mbruin-NR Sep 25, 2024
17b0416
[7.5.2-rc.1135] Staging Release
mbruin-NR Sep 25, 2024
25ab727
Merge pull request #310 from newrelic/staging
mbruin-NR Sep 25, 2024
711b37f
[create-pull-request] automated change
mbruin-NR Sep 25, 2024
c1da4a5
Merge pull request #311 from newrelic/auto-production-release-7.5.2
mbruin-NR Sep 25, 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
17 changes: 6 additions & 11 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@ jobs:
name : TestIOS
# runs-on: will be set to macos-latest when running on actual GHA.
# *** runs-on: ubuntu-latest is used when running via act on mac os. ***
runs-on: macos-latest
runs-on: macos-13
steps:
- uses: actions/checkout@master
with:
submodules: true

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: |
Expand All @@ -40,11 +40,6 @@ jobs:
- name: Run tests on iOS (using fastlane)
run: bundle exec fastlane runIOSTests

- uses: codecov/codecov-action@v3
with:
token: ${{ secrets.CODECOV_TOKEN }}
files: coverage.xml

testTVOS:
name : TestTVOS
# runs-on: will be set to macos-latest when running on actual GHA.
Expand All @@ -57,7 +52,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: brew install lcov
Expand All @@ -83,7 +78,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install lcov
run: brew install lcov
Expand All @@ -101,7 +96,7 @@ jobs:
name: DeployS3
# runs-on: will be set to macos-latest when running on actual GHA.
# *** runs-on: ubuntu-latest is used when running via act on mac os. ***
runs-on: macos-latest
runs-on: macos-13
needs: [testIOS, testTVOS, testWatchOS]
if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main'
outputs:
Expand All @@ -113,7 +108,7 @@ jobs:

- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.4'
xcode-version: '14.3'

- name: Install the Apple certificate and provisioning profile
env:
Expand Down
76 changes: 38 additions & 38 deletions Agent.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -6117,9 +6117,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6172,9 +6172,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_INSTRUMENT_PROGRAM_FLOW_ARCS = YES;
Expand Down Expand Up @@ -6249,10 +6249,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEBUG_INFORMATION_FORMAT = dwarf;
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6324,10 +6324,10 @@
CODE_SIGN_IDENTITY = "Apple Development: [email protected] (3ZGR4484Y2)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DISABLE_MANUAL_TARGET_ORDER_BUILD_WARNING = YES;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
Expand Down Expand Up @@ -6368,12 +6368,12 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=macosx*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6397,7 +6397,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand Down Expand Up @@ -6428,11 +6428,11 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -6454,7 +6454,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_CFLAGS = "$(inherited)";
OTHER_LDFLAGS = "";
Expand All @@ -6479,9 +6479,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = RQZ9D969HD;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6538,9 +6538,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
"$(PROJECT_DIR)/Frameworks",
Expand Down Expand Up @@ -6589,9 +6589,9 @@
CLANG_ENABLE_CODE_COVERAGE = YES;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
"${SRCROOT}/**",
Expand Down Expand Up @@ -6628,9 +6628,9 @@
CLANG_ENABLE_CODE_COVERAGE = YES;
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
HEADER_SEARCH_PATHS = (
"${PROJECT_DIR}/UnitTests/",
"${SRCROOT}/**",
Expand Down Expand Up @@ -6668,12 +6668,12 @@
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
"DEVELOPMENT_TEAM[sdk=appletvos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6695,7 +6695,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6721,11 +6721,11 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
Expand All @@ -6746,7 +6746,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = com.newrelic.Agent;
Expand All @@ -6772,9 +6772,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -6834,9 +6834,9 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++14";
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEVELOPMENT_TEAM = SU7SUNGZJP;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks";
GCC_C_LANGUAGE_STANDARD = "compiler-default";
Expand Down Expand Up @@ -6892,12 +6892,12 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -6920,7 +6920,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down Expand Up @@ -6950,12 +6950,12 @@
CODE_SIGN_IDENTITY = "Apple Distribution: New Relic Inc (SU7SUNGZJP)";
CODE_SIGN_STYLE = Manual;
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 7.5.1;
CURRENT_PROJECT_VERSION = 7.5.2;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=watchos*]" = SU7SUNGZJP;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 7.5.1;
DYLIB_CURRENT_VERSION = 7.5.2;
DYLIB_INSTALL_NAME_BASE = "@rpath";
ENABLE_MODULE_VERIFIER = YES;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
Expand All @@ -6977,7 +6977,7 @@
"@loader_path/Frameworks",
);
LOCALIZATION_PREFERS_STRING_CATALOGS = NO;
MARKETING_VERSION = 7.5.1;
MARKETING_VERSION = 7.5.2;
MODULEMAP_FILE = agent.modulemap;
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "";
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "";
Expand Down
1 change: 1 addition & 0 deletions Agent/Analytics/NRMAAnalytics.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@

- (void) sessionWillEnd;
- (void) newSession;
- (void) newSessionWithStartTime:(long long) sessionStartTime;

//value is either a NSString or NSNumber;
- (BOOL) setSessionAttribute:(NSString*)name value:(id)value;
Expand Down
Loading
Loading