diff --git a/build.gradle b/build.gradle
index 27b56793..2fa2ebc7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:8.6.0'
+ classpath 'com.android.tools.build:gradle:8.13.1'
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
diff --git a/hellocardboard-android/build.gradle b/hellocardboard-android/build.gradle
index a4188b6f..bc268776 100644
--- a/hellocardboard-android/build.gradle
+++ b/hellocardboard-android/build.gradle
@@ -1,9 +1,9 @@
apply plugin: 'com.android.application'
android {
- compileSdk 35
+ compileSdk = 35
lintOptions {
- abortOnError false
+ abortOnError = false
}
defaultConfig {
applicationId "com.google.cardboard.hellocardboard"
@@ -15,10 +15,10 @@ android {
// Vulkan - Requires 24 or higher
//
// See the release notes for details.
- minSdkVersion 26
- targetSdkVersion 35
+ minSdkVersion = 26
+ targetSdkVersion = 35
versionCode 1
- versionName "1.31.0"
+ versionName "1.32.0"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
@@ -36,7 +36,7 @@ android {
externalNativeBuild.cmake {
path "CMakeLists.txt"
}
- namespace 'com.google.cardboard'
+ namespace = 'com.google.cardboard'
}
dependencies {
diff --git a/hellocardboard-ios/HelloCardboard-Info.plist b/hellocardboard-ios/HelloCardboard-Info.plist
index 744762e6..a5f0976e 100644
--- a/hellocardboard-ios/HelloCardboard-Info.plist
+++ b/hellocardboard-ios/HelloCardboard-Info.plist
@@ -15,9 +15,9 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.31.0
+ 1.32.0
CFBundleVersion
- 1.31.0
+ 1.32.0
LSRequiresIPhoneOS
NSCameraUsageDescription
diff --git a/sdk/build.gradle b/sdk/build.gradle
index 74eeb917..923ef11a 100644
--- a/sdk/build.gradle
+++ b/sdk/build.gradle
@@ -2,9 +2,9 @@ apply plugin: 'com.android.library'
apply plugin: 'com.google.protobuf'
android {
- compileSdk 35
+ compileSdk = 35
lintOptions {
- abortOnError false
+ abortOnError = false
}
defaultConfig {
// #gles3 #vulkan - You can reduce minSdkVersion down to 16 depending
@@ -15,8 +15,9 @@ android {
// Vulkan - Requires 24 or higher
//
// See the release notes for details.
- minSdkVersion 26
- targetSdkVersion 35
+ minSdkVersion = 26
+ targetSdkVersion = 35
+ ndkVersion = "29.0.14206865"
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
ndk {
abiFilters 'armeabi-v7a', 'arm64-v8a'
@@ -49,7 +50,12 @@ android {
main.proto.srcDirs = ["${project.rootDir}/proto"]
main.proto.includes = ["cardboard_device.proto"]
}
- namespace 'com.google.cardboard.sdk'
+ namespace = 'com.google.cardboard.sdk'
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
}
protobuf {
diff --git a/sdk/qrcode/ios/sdk.bundle/resolutions.csv b/sdk/qrcode/ios/sdk.bundle/resolutions.csv
index c920bf12..19a84733 100644
--- a/sdk/qrcode/ios/sdk.bundle/resolutions.csv
+++ b/sdk/qrcode/ios/sdk.bundle/resolutions.csv
@@ -31,7 +31,7 @@ iPhone10.6,iPhone X,458.0f
iPhone11.2,iPhone Xs,458.0f
iPhone11.4,iPhone Xs Max,456.0f
iPhone11.6,iPhone Xs Max,456.0f
-iPhone11.8,iPhone Xr,456.0f
+iPhone11.8,iPhone Xr,326.0f
iPhone12.1,iPhone 11,326.0f
iPhone12.3,iPhone 11 Pro,458.0f
iPhone12.5,iPhone 11 Pro Max,458.0f
diff --git a/sdk/unity/xr_unity_plugin/vulkan/vulkan_renderer.cc b/sdk/unity/xr_unity_plugin/vulkan/vulkan_renderer.cc
index 28a2736b..91618139 100644
--- a/sdk/unity/xr_unity_plugin/vulkan/vulkan_renderer.cc
+++ b/sdk/unity/xr_unity_plugin/vulkan/vulkan_renderer.cc
@@ -303,6 +303,7 @@ class VulkanRenderer : public Renderer {
const VkRenderPassCreateInfo render_pass_create_info{
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_CREATE_INFO,
.pNext = nullptr,
+ .flags = 0,
.attachmentCount = 1,
.pAttachments = &attachment_descriptions,
.subpassCount = 1,