mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-26 17:37:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

android: Rename gradle projects.

Browse source 
Apparently in some contexts, only the last component of the name matters,
and it was the same for more than one module.

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2243>
This commit is contained in:
Rylie Pavlik 2024-06-07 13:47:30 -05:00 committed by Simon Zeni
parent cead23f5ec
commit 028425be9d
4 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
settings.gradle
View file

@ -23,7 +23,11 @@ dependencyResolutionManagement {
rootProject.name = 'monado' rootProject.name = 'monado'
include ':src:xrt:auxiliary:android' include ':src:xrt:auxiliary'
include ':src:xrt:ipc:android' project(':src:xrt:auxiliary').projectDir = new File(rootDir, 'src/xrt/auxiliary/android')
include ':src:xrt:ipc'
project(':src:xrt:ipc').projectDir = new File(rootDir, 'src/xrt/ipc/android')
include ':src:xrt:targets:android_common' include ':src:xrt:targets:android_common'
include ':src:xrt:targets:openxr_android' include ':src:xrt:targets:openxr_android'

2
src/xrt/ipc/android/build.gradle
View file

@ -60,7 +60,7 @@ android {
} }
dependencies { dependencies {
implementation project(':src:xrt:auxiliary:android') implementation project(':src:xrt:auxiliary')
implementation "androidx.annotation:annotation:$androidxAnnotationVersion" implementation "androidx.annotation:annotation:$androidxAnnotationVersion"
implementation "androidx.core:core-ktx:$androidxCoreVersion" implementation "androidx.core:core-ktx:$androidxCoreVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"

2
src/xrt/targets/android_common/build.gradle
View file

@ -65,7 +65,7 @@ android {
} }
dependencies { dependencies {
implementation project(':src:xrt:auxiliary:android') implementation project(':src:xrt:auxiliary')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion" implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion"

4
src/xrt/targets/openxr_android/build.gradle
View file

@ -284,8 +284,8 @@ aboutLibraries {
} }
dependencies { dependencies {
outOfProcessImplementation project(':src:xrt:ipc:android') outOfProcessImplementation project(':src:xrt:ipc')
implementation project(':src:xrt:auxiliary:android') implementation project(':src:xrt:auxiliary')
implementation project(':src:xrt:targets:android_common') implementation project(':src:xrt:targets:android_common')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion" implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"