Cardboard SDK v1.23.0

build.gradle

@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.18'
+        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.9.4'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,26 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
         # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
         # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \

hellocardboard-android/build.gradle

@@ -15,10 +15,10 @@ android {
         // Vulkan        - Requires 24 or higher
         //
         // See the release notes for details.
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
-        versionName "1.22.0"
+        versionName "1.23.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

hellocardboard-ios/HelloCardboard-Info.plist

@@ -15,9 +15,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.22.0</string>
+	<string>1.23.0</string>
 	<key>CFBundleVersion</key>
-	<string>1.22.0</string>
+	<string>1.23.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSCameraUsageDescription</key>

sdk/build.gradle

@@ -15,10 +15,10 @@ android {
         // Vulkan        - Requires 24 or higher
         //
         // See the release notes for details.
-        minSdkVersion 24
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode 1
-        versionName "1.22.0"
+        versionName "1.23.0"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndk {
             abiFilters 'armeabi-v7a', 'arm64-v8a'

sdk/sensors/android/device_accelerometer_sensor.cc

@@ -22,6 +22,7 @@
 #include <memory>
 #include <mutex>  // NOLINT
 
+#include "util/constants.h"
 #include "util/logging.h"
 
 // Workaround to avoid the inclusion of "android_native_app_glue.h.
@@ -128,7 +129,13 @@ struct DeviceAccelerometerSensor::SensorInfo {
 
 DeviceAccelerometerSensor::DeviceAccelerometerSensor()
     : sensor_info_(new SensorInfo()) {
+#if __ANDROID_MIN_SDK_VERSION__ >= 26
+  sensor_info_->sensor_manager =
+      ASensorManager_getInstanceForPackage(Constants::kCardboardSdkPackageName);
+#else
+  // TODO: b/314792983 - Remove deprecated NDK methods.
   sensor_info_->sensor_manager = ASensorManager_getInstance();
+#endif
   sensor_info_->sensor = InitSensor(sensor_info_->sensor_manager);
   if (!sensor_info_->sensor) {
     return;

sdk/sensors/android/device_gyroscope_sensor.cc

@@ -23,6 +23,7 @@
 
 #include "sensors/accelerometer_data.h"
 #include "sensors/gyroscope_data.h"
+#include "util/constants.h"
 #include "util/logging.h"
 
 // Workaround to avoid the inclusion of "android_native_app_glue.h.
@@ -140,17 +141,15 @@ class SensorEventQueueReader {
 
 // This struct holds android gyroscope specific sensor information.
 struct DeviceGyroscopeSensor::SensorInfo {
-  SensorInfo()
-      : sensor_manager(nullptr), sensor(nullptr) {}
+  SensorInfo() : sensor_manager(nullptr), sensor(nullptr) {}
   ASensorManager* sensor_manager;
   const ASensor* sensor;
   std::unique_ptr<SensorEventQueueReader> reader;
 };
 
 namespace {
 
-bool ParseGyroEvent(const ASensorEvent& event,
-                    GyroscopeData* sample) {
+bool ParseGyroEvent(const ASensorEvent& event, GyroscopeData* sample) {
   if (event.type == ASENSOR_TYPE_ADDITIONAL_INFO) {
     CARDBOARD_LOGI("ParseGyroEvent discarding additional info sensor event");
     return false;
@@ -181,7 +180,13 @@ bool ParseGyroEvent(const ASensorEvent& event,
 
 DeviceGyroscopeSensor::DeviceGyroscopeSensor()
     : sensor_info_(new SensorInfo()) {
+#if __ANDROID_MIN_SDK_VERSION__ >= 26
+  sensor_info_->sensor_manager =
+      ASensorManager_getInstanceForPackage(Constants::kCardboardSdkPackageName);
+#else
+  // TODO: b/314792983 - Remove deprecated NDK methods.
   sensor_info_->sensor_manager = ASensorManager_getInstance();
+#endif
   sensor_info_->sensor = InitSensor(sensor_info_->sensor_manager);
   if (!sensor_info_->sensor) {
     return;

sdk/util/constants.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef CARDBOARD_SDK_UTIL_CONSTANTS_H_
+#define CARDBOARD_SDK_UTIL_CONSTANTS_H_
+
+namespace cardboard {
+
+// Common constants.
+struct Constants {
+  // Cardboard SDK package name.
+  static constexpr char kCardboardSdkPackageName[] = "com.google.cardboard.sdk";
+};
+
+}  // namespace cardboard
+
+#endif  // CARDBOARD_SDK_UTIL_CONSTANTS_H_

third_party/unity_plugin_api/third_party.unity.pluginapi.blueprint

@@ -9,7 +9,7 @@ blueprint_file = ::bluze::BlueprintFile(
 
   project_name = "third_party.unity.pluginapi",
   teams_product_id = 1134145041667,
-  tech_lead = ["jfinder"],
+  tech_lead = ["gunderwood", "squin"],
   dev_mailing_list = "[email protected]",
   mdb_groups = ["third-party-tap-forge"],
   buganizer_component_ids = [437622],