Cardboard SDK v1.9.0

LICENSE

@@ -1,45 +1,5 @@
 ===============================================================================
 
-All files in the following folders:
-- third_party/libprotobuf/
-
-are licensed as follows:
-
-Copyright 2008 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
- * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Code generated by the Protocol Buffer compiler is owned by the owner
-of the input file used when generating it. This code is not
-standalone and requires a support library to be linked with it. This
-support library is itself covered by the above license.
-
-===============================================================================
-
 All files in the following folders:
 - third_party/unity_plugin_api/
 

Podfile

@@ -0,0 +1,33 @@
+platform :ios, '12.0'
+
+# Avoid warnings when building dependencies.
+inhibit_all_warnings!
+
+workspace 'Cardboard'
+
+project 'sdk/sdk.xcodeproj'
+
+target 'sdk' do
+ pod 'Protobuf-C++', '3.18.0'
+end
+
+post_install do |installer|
+ installer.pods_project.targets.each do |target|
+ target.build_configurations.each do |config|
+ if target.name == "Protobuf-C++"
+ # Bump iOS target version to match Cardboard SDK's one (see
+ # https://github.com/CocoaPods/Specs/blob/fbeb2ed05637cbd85ce9ffb4700fae03dfea5f7e/Specs/1/4/6/Protobuf-C%2B%2B/3.18.0/Protobuf-C%2B%2B.podspec.json#L32).
+ config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '12.0'
+
+ # Override preprocessor definitions to prevent a redefinition warning
+ # caused by the "inherited" variable being added twice (see
+ # https://github.com/CocoaPods/Specs/blob/fbeb2ed05637cbd85ce9ffb4700fae03dfea5f7e/Specs/1/4/6/Protobuf-C%2B%2B/3.18.0/Protobuf-C%2B%2B.podspec.json#L40).
+ if config.name == "Debug"
+ config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['POD_CONFIGURATION_DEBUG=1', 'DEBUG=1', 'COCOAPODS=1', 'HAVE_PTHREAD=1']
+ else
+ config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] = ['POD_CONFIGURATION_RELEASE=1', 'COCOAPODS=1', 'HAVE_PTHREAD=1']
+ end
+ end
+ end
+ end
+end

hellocardboard-android/build.gradle

@@ -11,7 +11,7 @@ android {
  minSdkVersion 18
  targetSdkVersion 30
  versionCode 1
- versionName "1.8.0"
+ versionName "1.9.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.8.0</string>
+ <string>1.9.0</string>
  <key>CFBundleVersion</key>
- <string>1.8.0</string>
+ <string>1.9.0</string>
  <key>LSRequiresIPhoneOS</key>
  <true/>
  <key>NSCameraUsageDescription</key>