ReactVision · hannesa2 · Jun 18, 2024 · Jun 18, 2024 · Jun 18, 2024 · Jun 18, 2024
diff --git a/.github/release.yml b/.github/release.yml
@@ -11,6 +11,18 @@ changelog:
     - title: Exciting New Features 🎉
       labels:
         - enhancement
+    - title: Dependencies
+      labels:
+        - dependencies
+    - title: Espresso test
+      labels:
+        - Espresso
+    - title: Bug fix
+      labels:
+        - bugfix
+    - title: Pipeline
+      labels:
+        - pipeline
     - title: Other Changes
       labels:
         - "*"
diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - main
+      - develop
   pull_request:
 
 jobs:
@@ -20,6 +21,12 @@ jobs:
       - name: assemble ViroCore
         run: |
           ./gradlew :viroreact:assembleDebug
+          ./gradlew :code-samples:ARPlacingObjects:assembleDebug
+          ./gradlew :code-samples:ARRetail:assembleDebug
+          ./gradlew :code-samples:ARTesla:assembleDebug
+          ./gradlew :code-samples:ARHelloWorldAndroid:assembleDebug
+          ./gradlew :code-samples:ARBlackPanther:assembleDebug
+          ./gradlew :mainSample:assembleDebug
         working-directory: ./android
       - name: Upload result ViroCore
         uses: actions/upload-artifact@v4.4.0
@@ -46,6 +53,7 @@ jobs:
         with:
           distribution: "adopt"
           java-version: 17
+      - uses: gradle/wrapper-validation-action@v3
       - name: Code checks
         run: ./gradlew :viroreact:check
       - name: Archive Lint report
@@ -62,9 +70,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        xcode: ["14.2.0", "13.4.1"]
-        macOS: ["macos-12"]
+        macOS: [ "macos-13" ]
+        xcode: [ "15.2.0" ]
     steps:
+      - name: Investigate available XCode versions
+        run: ls -n /Applications/ | grep Xcode*
       - uses: actions/checkout@v4.2.0
       - name: Install gpg
         run: brew install gnupg

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/android/code-samples/ARBlackPanther/build.gradle b/android/code-samples/ARBlackPanther/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     namespace "com.example.virosample.blackPanther"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndkVersion = "25.2.9519653"
         ndk {

diff --git a/android/code-samples/ARHelloWorldAndroid/build.gradle b/android/code-samples/ARHelloWorldAndroid/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     namespace "com.example.virosample.hello"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndkVersion = "25.2.9519653"
         ndk {

diff --git a/android/code-samples/ARPlacingObjects/build.gradle b/android/code-samples/ARPlacingObjects/build.gradle
@@ -2,19 +2,22 @@ apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     namespace "com.example.virosample.placingObjects"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndkVersion = "25.2.9519653"
         ndk {
             abiFilters "arm64-v8a", "armeabi-v7a", "x86", "armeabi", "mips"
         }
     }
-
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
     lintOptions {
         disable 'UsingOnClickInXml'
     }

diff --git a/android/code-samples/ARRetail/build.gradle b/android/code-samples/ARRetail/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     namespace "com.example.virosample.retail"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndkVersion = "25.2.9519653"
         ndk {

diff --git a/android/code-samples/ARTesla/build.gradle b/android/code-samples/ARTesla/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     namespace "com.example.virosample.tesla"
 
     defaultConfig {
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         ndkVersion = "25.2.9519653"
         ndk {

diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists