Skip to content

Merge release 0.6.0 into trunk#153

Merged
mokagio merged 24 commits intotrunkfrom
release/0.6.0
Oct 14, 2020
Merged

Merge release 0.6.0 into trunk#153
mokagio merged 24 commits intotrunkfrom
release/0.6.0

Conversation

@mokagio
Copy link
Contributor

@mokagio mokagio commented Oct 14, 2020

As per #151 (review)

loremattei and others added 24 commits August 24, 2020 18:07
Merge release/0.5.1 back into develop
…tracking-by-default

Disable automatic breadcrumb tracking by default
The code generated this warning:

> Left side of nil coalescing operator '??' has non-optional type
> 'Bool', so the right side is never used
The project changes were made by the Xcode upgrade wizard.
Because of the build system changes in Xcode 12 due to the support of
Apple Silicon, we now need to explicitly exclude the arm64 architecture
from the build, otherwise xcodebuild will fail to build.

I opened an issue in the Sodium repo, see
jedisct1/swift-sodium#213, but I haven't
received feedback yet.

In order to unblock our progress, I created a fork of Sodium,
Sodium-Fork, which incorporate the necessary changes to pass the
validation.

I published the fork on CocoaPods, but unfortunately CI seems to fail to
find it.
See this build:
https://app.circleci.com/pipelines/github/Automattic/Automattic-Tracks-iOS/380/workflows/c0206d34-0f8a-4913-8b5d-b05e6dcb7c5b/jobs/936

I tried to set the `update-specs-sources` parameter to true, but it
didn't make any difference.
Interestingly, CI shows that the command runs, but there is no output
and the execution time is 1s, too little to fetch the CocoaPods specs
repo.
This makes me think there might be something wrong in the setup or in
how CI runs it.

To address this issue, I published the pod on my private specs repo, and
added its URL to the sources for the validation.

Funny enough, while the spec validation fails to find the new pod, the `pod
install` command in a different job has no problems with it.
This will allow us to add the conditional logic for the sandbox vs
non-sandbox location later on.
We'll need this later to make the custom init with the sandbox mode flag
non-nullable.
This should have always been the case, but somehow I got confused and
didn't realize my mistake.

Thanks @jleandroperez for picking this up! Goes to show that tests are
only good when written properly!

https://github.com/Automattic/Automattic-Tracks-iOS/pull/147/files/3e38df8087e7b38a76b45acc5e89527746b4145b#r498830462
This fixes a potential crash if these events are later used with Encrypted Logging
@mokagio mokagio requested a review from jkmassel October 14, 2020 03:05
@mokagio mokagio marked this pull request as ready for review October 14, 2020 03:06
@mokagio mokagio merged commit 0cb8761 into trunk Oct 14, 2020
@mokagio mokagio deleted the release/0.6.0 branch October 14, 2020 04:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants