From 52e75e8e27bc2970648c2a0b37e4ef8bba75b7f5 Mon Sep 17 00:00:00 2001
From: Ryan Pavlik <ryan.pavlik@collabora.com>
Date: Tue, 18 May 2021 11:53:25 -0500
Subject: [PATCH] t/oxr_android: Update Hilt to a stable release

Only one change in our usage was needed.
---
 build.gradle                                                | 4 ++--
 .../monado/openxr_runtime/MonadoOpenXrAndroidModule.kt      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index ac4864794..4a29c1f19 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-// Copyright 2020, Collabora, Ltd.
+// Copyright 2020-2021, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 
 buildscript {
@@ -14,7 +14,7 @@ buildscript {
         androidxLifecycleVersion = "2.2.0"
         androidxConstraintLayoutVersion = '2.0.4'
 
-        hiltVersion = "2.29.1-alpha"
+        hiltVersion = '2.35.1'
 
         // Saw some breakage when updating to 1.2?
         materialVersion = "1.1.0"
diff --git a/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MonadoOpenXrAndroidModule.kt b/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MonadoOpenXrAndroidModule.kt
index 7ed0da02e..49ac5aa51 100644
--- a/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MonadoOpenXrAndroidModule.kt
+++ b/src/xrt/targets/openxr_android/src/main/java/org/freedesktop/monado/openxr_runtime/MonadoOpenXrAndroidModule.kt
@@ -1,4 +1,4 @@
-// Copyright 2020, Collabora, Ltd.
+// Copyright 2020-2021, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 /*!
  * @file
@@ -11,7 +11,7 @@ package org.freedesktop.monado.openxr_runtime
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ApplicationComponent
+import dagger.hilt.components.SingletonComponent
 import org.freedesktop.monado.android_common.NoticeFragmentProvider
 import org.freedesktop.monado.android_common.ServiceNotificationImpl
 import org.freedesktop.monado.auxiliary.IServiceNotification
@@ -25,7 +25,7 @@ import org.freedesktop.monado.auxiliary.UiProvider
  * base/interface to use for each thing it must inject.
  */
 @Module
-@InstallIn(ApplicationComponent::class)
+@InstallIn(SingletonComponent::class)
 abstract class MonadoOpenXrAndroidModule {
     @Binds
     abstract fun bindUiProvider(uiProvider: MonadoOpenXrUiProvider): UiProvider