Migrate to alpha04 (from snapshot build)

Author: devbridie

gradle/libs.versions.toml

@@ -63,9 +63,9 @@ playServicesWearable = "19.0.0"
 protolayout = "1.2.1"
 recyclerview = "1.4.0"
 # @keep
-androidx-xr-arcore = "1.0.0-SNAPSHOT"
-androidx-xr-scenecore = "1.0.0-SNAPSHOT"
-androidx-xr-compose = "1.0.0-SNAPSHOT"
+androidx-xr-arcore = "1.0.0-alpha04"
+androidx-xr-scenecore = "1.0.0-alpha04"
+androidx-xr-compose = "1.0.0-alpha04"
 targetSdk = "34"
 tiles = "1.4.1"
 version-catalog-update = "1.0.0"

settings.gradle.kts

@@ -1,4 +1,4 @@
-val snapshotVersion : String? = "13432914"
+val snapshotVersion : String? = System.getenv("COMPOSE_SNAPSHOT_ID")
 
 pluginManagement {
     repositories {

xr/build.gradle.kts

@@ -25,23 +25,12 @@ android {
     buildFeatures {
         compose = true
     }
-    lint {
-        lintOptions.disable += "RestrictedApi"
-    }
 }
 
 dependencies {
-    implementation(libs.androidx.xr.arcore)  {
-        exclude(module = "impress")
-    }
-    implementation(libs.androidx.xr.scenecore)  {
-        exclude(module = "impress")
-    }
-    implementation(libs.androidx.xr.compose)  {
-        exclude(module = "impress")
-    }
-
-    implementation("com.google.ar:impress:0.0.2")
+    implementation(libs.androidx.xr.arcore)
+    implementation(libs.androidx.xr.scenecore)
+    implementation(libs.androidx.xr.compose)
 
     implementation(libs.androidx.activity.ktx)
     implementation(libs.guava)

xr/src/main/java/com/example/xr/arcore/Anchors.kt

@@ -29,6 +29,7 @@ import androidx.xr.scenecore.AnchorEntity
 import androidx.xr.scenecore.Entity
 import androidx.xr.scenecore.scene
 
+@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun configureAnchoring(session: Session) {
     // [START androidxr_arcore_anchoring_configure]
     val newConfig = session.config.copy(

xr/src/main/java/com/example/xr/arcore/Hands.kt

@@ -25,13 +25,14 @@ import androidx.xr.runtime.Session
 import androidx.xr.runtime.SessionConfigureConfigurationNotSupported
 import androidx.xr.runtime.SessionConfigurePermissionsNotGranted
 import androidx.xr.runtime.SessionConfigureSuccess
-import androidx.xr.runtime.internal.GltfEntity
 import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Quaternion
 import androidx.xr.runtime.math.Vector3
+import androidx.xr.scenecore.GltfModelEntity
 import androidx.xr.scenecore.scene
 import kotlinx.coroutines.launch
 
+@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun ComponentActivity.configureSession(session: Session) {
     // [START androidxr_arcore_hand_configure]
     val newConfig = session.config.copy(
@@ -66,7 +67,7 @@ fun ComponentActivity.collectHands(session: Session) {
 
 fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
     val session: Session = null!!
-    val palmEntity: GltfEntity = null!!
+    val palmEntity: GltfModelEntity = null!!
     // [START androidxr_arcore_hand_entityAtHandPalm]
     val palmPose = leftHandState.handJoints[HandJointType.PALM] ?: return
 
@@ -86,7 +87,7 @@ fun ComponentActivity.renderPlanetAtHandPalm(leftHandState: Hand.State) {
 
 fun ComponentActivity.renderPlanetAtFingerTip(rightHandState: Hand.State) {
     val session: Session = null!!
-    val indexFingerEntity: GltfEntity = null!!
+    val indexFingerEntity: GltfModelEntity = null!!
 
     // [START androidxr_arcore_hand_entityAtIndexFingerTip]
     val tipPose = rightHandState.handJoints[HandJointType.INDEX_TIP] ?: return

xr/src/main/java/com/example/xr/arcore/Planes.kt

@@ -26,6 +26,7 @@ import androidx.xr.runtime.math.Pose
 import androidx.xr.runtime.math.Ray
 import androidx.xr.scenecore.scene
 
+@Suppress("RestrictedApi") // b/416288516 - session.config and session.configure() are incorrectly restricted
 fun configurePlaneTracking(session: Session) {
     // [START androidxr_arcore_planetracking_configure]
     val newConfig = session.config.copy(