Merge branch 'release-v51.5.0' into release

mozilla · Oct 18, 2022 · 1d7cd8d · 1d7cd8d
2 parents 768930f + c754562
commit 1d7cd8d
Show file tree

Hide file tree

Showing 51 changed files with 491 additions and 374 deletions.
diff --git a/.buildconfig.yml b/.buildconfig.yml
@@ -1,4 +1,4 @@
-libraryVersion: 51.4.0
+libraryVersion: 51.5.0
 groupId: org.mozilla.telemetry
 projects:
   glean:

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -462,7 +462,7 @@ jobs:
 
   Check Swift formatting:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - checkout
       - run:
@@ -478,7 +478,7 @@ jobs:
 
   iOS build and test:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - checkout
       - run:
@@ -490,23 +490,28 @@ jobs:
       - setup-rust-toolchain
       - restore_cache:
           name: Restore rubygems cache
-          key: swift-docs-gems-v11
+          key: swift-docs-gems-v12
       - run:
           name: Install jazzy
           command: gem install jazzy
       - save_cache:
           name: Save rubygems cache
           # NEEDS TO CHANGE WHEN JAZZY OR RUBY IS UPDATED
-          key: swift-docs-gems-v11
+          key: swift-docs-gems-v12
           paths:
-            - ~/.gem/ruby/2.7.5
+            - ~/.gem/ruby/2.7.6
       - run:
           name: Setup build environment
           command: |
+            set -x
             rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
 
-            UDID=$(xcrun xctrace list devices 2>&1 | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
-            xcrun simctl boot "$UDID"
+            # List available devices -- allows us to see what's there
+            DEVICES=$(xcrun xctrace list devices 2>&1)
+            echo "$DEVICES"
+            # Pick a device and start it
+            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 14 Simulator (16' | awk -F'[()]' '{print $4}')
+            xcrun simctl boot "$UUID"
             # Store build type for use in cache key
             if [ -z "${CIRCLE_TAG}" ]; then
               echo "debug" > buildtype.txt
@@ -574,7 +579,7 @@ jobs:
 
   iOS integration test:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - checkout
       - skip-if-doc-only
@@ -583,14 +588,15 @@ jobs:
       - run:
           name: Setup build environment
           command: |
+            set -x
             rustup target add aarch64-apple-ios aarch64-apple-ios-sim x86_64-apple-ios
 
             # List available devices -- allows us to see what's there
             DEVICES=$(xcrun xctrace list devices 2>&1)
             echo "$DEVICES"
             # Pick a device and start it
-            UDID=$(echo "$DEVICES" | grep 'iPhone 11 Simulator (14' | awk -F'[()]' '{print $4}')
-            xcrun simctl boot "$UDID"
+            UUID=$(echo "$DEVICES" | grep --max-count=1 'iPhone 14 Simulator (16' | awk -F'[()]' '{print $4}')
+            xcrun simctl boot "$UUID"
       - run:
           name: Build XCFramework archive
           command: |
@@ -625,7 +631,7 @@ jobs:
 
   iOS Framework release:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - checkout
       - attach_workspace:
@@ -866,7 +872,7 @@ jobs:
 
   pypi-macos-release:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - install-rustup
       - setup-rust-toolchain
@@ -898,7 +904,7 @@ jobs:
 
   pypi-macos-arm64-release:
     macos:
-      xcode: "13.2.1"
+      xcode: "14.0.0"
     steps:
       - install-rustup
       - setup-rust-toolchain

diff --git a/.circleci/jazzy.yml b/.circleci/jazzy.yml
@@ -10,4 +10,4 @@ xcodebuild_arguments:
     - "-scheme"
     - "Glean"
     - "-destination"
-    - "platform=iOS Simulator,name=iPhone 11"
+    - "platform=iOS Simulator,name=iPhone 14"
diff --git a/.dictionary b/.dictionary
@@ -1,10 +1,11 @@
-personal_ws-1.1 en 251 utf-8
+personal_ws-1.1 en 252 utf-8
 AAR
 AARs
 ABI
 API's
 APIs
 APK
+AndroidX
 AppServices
 BUGFIX
 Bool

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,13 +1,28 @@
 # Unreleased changes
 
-[Full changelog](https://github.com/mozilla/glean/compare/v51.4.0...main)
+[Full changelog](https://github.com/mozilla/glean/compare/v51.5.0...main)
+
+# v51.5.0 (2022-10-18)
+
+[Full changelog](https://github.com/mozilla/glean/compare/v51.4.0...v51.5.0)
+
+* General
+  * Add `count` to `DistributionData` payload ([#2196](https://github.com/mozilla/glean/pull/2196))
+  * Update to UniFFI 0.21.0 ([#2229](https://github.com/mozilla/glean/pull/2229))
+* Android
+  * Synchronize AndroidX dependencies with AC ([#2219](https://github.com/mozilla/glean/pull/2219))
+  * Bump `jna` to 5.12.1 #2221 ([#2221](https://github.com/mozilla/glean/pull/2221))
+* iOS
+  * Glean for iOS is now being built with Xcode 14.0 ([#2188](https://github.com/mozilla/glean/pull/2188))
 
 # v51.4.0 (2022-10-04)
 
 [Full changelog](https://github.com/mozilla/glean/compare/v51.3.0...v51.4.0)
 
 * Kotlin
   * Update Kotlin and Android Gradle Plugin to the latest releases ([#2211](https://github.com/mozilla/glean/pull/2211))
+* Swift
+  * Fix for iOS startup crash caused by Glean ([#2206](https://github.com/mozilla/glean/pull/2206))
 
 * Swift
   * Fix for iOS startup crash caused by Glean ([#2206](https://github.com/mozilla/glean/pull/2206))