Updated core, tools and samples (updated Android build configuration)

DiligentGraphics · Sep 5, 2023 · ec028ed · ec028ed
1 parent b987b9b
commit ec028ed
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -27,8 +27,7 @@ jobs:
       if:   success()
       uses: DiligentGraphics/github-action/setup-build-env@v1
       with:
-        platform:     Android
-        java-version: 8 # Override Java version
+        platform: Android
 
     - name: Build with Gradle
       if:   success()

diff --git a/DiligentCore b/DiligentCore
diff --git a/DiligentSamples b/DiligentSamples
diff --git a/DiligentTools b/DiligentTools
+2 −1		BuildTools/Android/tests/src/main/AndroidManifest.xml
+8 −0		Graphics/GraphicsEngineOpenGL/src/GLTypeConversions.cpp
+8 −0		Graphics/GraphicsEngineOpenGL/src/TextureBaseGL.cpp
+1 −2		.github/workflows/build-android.yml
+4 −3		Android/.gitignore
+1 −0		Android/Atmosphere/build.gradle
+3 −3		Android/Atmosphere/src/main/AndroidManifest.xml
+1 −0		Android/GLTFViewer/build.gradle
+3 −3		Android/GLTFViewer/src/main/AndroidManifest.xml
+1 −0		Android/HelloAR/build.gradle
+4 −2		Android/HelloAR/src/main/AndroidManifest.xml
+2 −4		Android/HelloAR/src/main/cpp/BackgroundRenderer.cc
+7 −6		Android/HelloAR/src/main/java/com/google/ar/core/examples/c/helloar/CameraPermissionHelper.java
+3 −2		Android/HelloAR/src/main/java/com/google/ar/core/examples/c/helloar/HelloArActivity.java
+1 −0		Android/ImguiDemo/build.gradle
+3 −3		Android/ImguiDemo/src/main/AndroidManifest.xml
+1 −0		Android/Shadows/build.gradle
+3 −3		Android/Shadows/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial01_HelloTriangle/build.gradle
+3 −3		Android/Tutorial01_HelloTriangle/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial02_Cube/build.gradle
+3 −3		Android/Tutorial02_Cube/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial03_Texturing-C/build.gradle
+3 −3		Android/Tutorial03_Texturing-C/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial03_Texturing/build.gradle
+3 −3		Android/Tutorial03_Texturing/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial04_Instancing/build.gradle
+3 −3		Android/Tutorial04_Instancing/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial05_TextureArray/build.gradle
+3 −3		Android/Tutorial05_TextureArray/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial06_Multithreading/build.gradle
+3 −3		Android/Tutorial06_Multithreading/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial07_GeometryShader/build.gradle
+3 −3		Android/Tutorial07_GeometryShader/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial08_Tessellation/build.gradle
+3 −3		Android/Tutorial08_Tessellation/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial09_Quads/build.gradle
+3 −3		Android/Tutorial09_Quads/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial10_DataStreaming/build.gradle
+3 −3		Android/Tutorial10_DataStreaming/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial11_ResourceUpdates/build.gradle
+3 −3		Android/Tutorial11_ResourceUpdates/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial12_RenderTarget/build.gradle
+3 −3		Android/Tutorial12_RenderTarget/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial13_ShadowMap/build.gradle
+3 −3		Android/Tutorial13_ShadowMap/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial14_ComputeShader/build.gradle
+3 −3		Android/Tutorial14_ComputeShader/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial16_BindlessResources/build.gradle
+3 −3		Android/Tutorial16_BindlessResources/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial17_MSAA/build.gradle
+3 −3		Android/Tutorial17_MSAA/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial18_Queries/build.gradle
+3 −3		Android/Tutorial18_Queries/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial19_RenderPasses/build.gradle
+3 −3		Android/Tutorial19_RenderPasses/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial23_CommandQueues/build.gradle
+3 −3		Android/Tutorial23_CommandQueues/src/main/AndroidManifest.xml
+1 −0		Android/Tutorial24_VRS/build.gradle
+3 −3		Android/Tutorial24_VRS/src/main/AndroidManifest.xml
+4 −1		Android/build.gradle
+19 −0		Android/gradle.properties
+ −		Android/gradle/wrapper/gradle-wrapper.jar
+2 −2		Android/gradle/wrapper/gradle-wrapper.properties
+182 −108		Android/gradlew
+26 −27		Android/gradlew.bat
+2 −2		NativeApp/Android/android_common.gradle
+3 −1		NativeApp/Android/build.gradle
+1 −2		NativeApp/Android/src/main/AndroidManifest.xml