Skip to content

Commit

Permalink
Update Pico SDK | Fix Build Issue
Browse files Browse the repository at this point in the history
  • Loading branch information
CADIndie committed Oct 16, 2024
1 parent 1e5bb2b commit c1271e9
Show file tree
Hide file tree
Showing 646 changed files with 19,436 additions and 525 deletions.
Binary file added Assets/Plugins/Android/Pojlib-release.aar
Binary file not shown.
32 changes: 32 additions & 0 deletions Assets/Plugins/Android/Pojlib-release.aar.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 2 additions & 6 deletions Assets/Plugins/Android/launcherTemplate.gradle
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
apply plugin: 'com.android.application'

repositories {
maven {
url = uri("https://jitpack.io")
}
}

dependencies {
implementation project(':unityLibrary')
implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
}

android {
namespace "**NAMESPACE**"
ndkPath "**NDKPATH**"
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'

Expand Down
70 changes: 70 additions & 0 deletions Assets/Plugins/Android/launcherTemplate.gradle.backup
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
apply plugin: 'com.android.application'

repositories {
maven {
url = uri("https://jitpack.io")
}
}

dependencies {
implementation project(':unityLibrary')
implementation("com.github.Mathias-Boulay:android_gamepad_remapper:2.0.3")
}

android {
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

packagingOptions {
pickFirst '**/*.so'
}

defaultConfig {
minSdkVersion **MINSDKVERSION**
targetSdkVersion **TARGETSDKVERSION**
applicationId '**APPLICATIONID**'
ndk {
abiFilters **ABIFILTERS**
}
versionCode **VERSIONCODE**
versionName '**VERSIONNAME**'
}

aaptOptions {
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
}**SIGN**

lintOptions {
abortOnError false
}

buildTypes {
debug {
minifyEnabled **MINIFY_DEBUG**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
jniDebuggable true
}
release {
minifyEnabled **MINIFY_RELEASE**
proguardFiles getDefaultProguardFile('proguard-android.txt')**SIGNCONFIG**
}
}**PACKAGING_OPTIONS****PLAY_ASSET_PACKS****SPLITS**
**BUILT_APK_LOCATION**
bundle {
language {
enableSplit = false
}
density {
enableSplit = false
}
abi {
enableSplit = true
}
}
}**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**
7 changes: 7 additions & 0 deletions Assets/Plugins/Android/launcherTemplate.gradle.backup.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Assets/Plugins/Android/mainTemplate.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ dependencies {
**DEPS**}

android {
namespace "com.unity3d.player"
ndkPath "**NDKPATH**"
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'

Expand Down
47 changes: 47 additions & 0 deletions Assets/Plugins/Android/mainTemplate.gradle.backup
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
apply plugin: 'com.android.library'
**APPLY_PLUGINS**

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation("com.google.guava:guava:31.0.1-jre")
implementation("commons-io:commons-io:2.11.0")
implementation("commons-codec:commons-codec:1.15")
implementation("com.microsoft.azure:msal4j:1.17.0")
**DEPS**}

android {
compileSdkVersion **APIVERSION**
buildToolsVersion '**BUILDTOOLS**'

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

defaultConfig {
minSdkVersion **MINSDKVERSION**
targetSdkVersion **TARGETSDKVERSION**
ndk {
abiFilters **ABIFILTERS**
}
versionCode **VERSIONCODE**
versionName '**VERSIONNAME**'
consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
}

lintOptions {
abortOnError false
}

packagingOptions {
pickFirst '**/*.so'
}

aaptOptions {
noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~"
}**PACKAGING_OPTIONS**
}**REPOSITORIES**
**IL_CPP_BUILD_SETUP**
**SOURCE_BUILD_SETUP**
**EXTERNAL_SOURCES**
7 changes: 7 additions & 0 deletions Assets/Plugins/Android/mainTemplate.gradle.backup.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions Assets/Plugins/Android/settingsTemplate.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
pluginManagement {
repositories {
**ARTIFACTORYREPOSITORY**
gradlePluginPortal()
google()
mavenCentral()
}
}

include ':launcher', ':unityLibrary'
**INCLUDES**

dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
repositories {
**ARTIFACTORYREPOSITORY**
google()
mavenCentral()
maven {
url = uri("https://jitpack.io")
}
flatDir {
dirs "${project(':unityLibrary').projectDir}/libs"
}
}
}
7 changes: 7 additions & 0 deletions Assets/Plugins/Android/settingsTemplate.gradle.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ public class ActionBasedControllerManager : MonoBehaviour

[SerializeField]
[Tooltip("The GameObject containing the interaction group used for direct and distant manipulation.")]
XRInteractionGroup m_ManipulationInteractionGroup;
UnityEngine.XR.Interaction.Toolkit.Interactors.XRInteractionGroup m_ManipulationInteractionGroup;

[SerializeField]
[Tooltip("The GameObject containing the interactor used for direct manipulation.")]
XRDirectInteractor m_DirectInteractor;
UnityEngine.XR.Interaction.Toolkit.Interactors.XRDirectInteractor m_DirectInteractor;

[SerializeField]
[Tooltip("The GameObject containing the interactor used for distant/ray manipulation.")]
XRRayInteractor m_RayInteractor;
UnityEngine.XR.Interaction.Toolkit.Interactors.XRRayInteractor m_RayInteractor;

[SerializeField]
[Tooltip("The GameObject containing the interactor used for teleportation.")]
XRRayInteractor m_TeleportInteractor;
UnityEngine.XR.Interaction.Toolkit.Interactors.XRRayInteractor m_TeleportInteractor;

[Space]
[Header("Controller Actions")]
Expand Down Expand Up @@ -99,7 +99,7 @@ public bool smoothTurnEnabled
/// <summary>
/// Temporary scratch list to populate with the group members of the interaction group.
/// </summary>
static readonly List<IXRGroupMember> s_GroupMembers = new List<IXRGroupMember>();
static readonly List<UnityEngine.XR.Interaction.Toolkit.Interactors.IXRGroupMember> s_GroupMembers = new List<UnityEngine.XR.Interaction.Toolkit.Interactors.IXRGroupMember>();

// For our input mediation, we are enforcing a few rules between direct, ray, and teleportation interaction:
// 1. If the Teleportation Ray is engaged, the Ray interactor is disabled
Expand Down
Loading

0 comments on commit c1271e9

Please sign in to comment.