Merge branch 'main' into user/hirosn/clangtidyissue

microsoft · Sep 6, 2024 · 777b230 · 777b230
2 parents 2599dc7 + 9e3ec45
commit 777b230
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build-android.yml b/.github/workflows/build-android.yml
@@ -73,7 +73,7 @@ jobs:
       working-directory: lib\android_build
     - name: Upload Reports
       if: failure()
-      uses: actions/upload-artifact@v1
+      uses: actions/upload-artifact@v4
       with:
         name: reports
         path: lib\android_build\maesdk\build\reports
diff --git a/lib/android_build/maesdk/build.gradle b/lib/android_build/maesdk/build.gradle
@@ -77,7 +77,7 @@ dependencies {
     annotationProcessor "androidx.room:room-compiler:$room_version"
 
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-inline:3.2.4'
+    testImplementation 'org.mockito:mockito-core:5.13.0'
     testImplementation "androidx.room:room-testing:$room_version"
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

diff --git a/lib/include/public/Version.hpp b/lib/include/public/Version.hpp
@@ -6,8 +6,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.8.32.1"
-#define BUILD_VERSION 3,8,32,1
+#define BUILD_VERSION_STR "3.8.249.1"
+#define BUILD_VERSION 3,8,249,1
 
 #ifndef RESOURCE_COMPILER_INVOKED
 #include "ctmacros.hpp"
@@ -18,7 +18,7 @@ namespace MAT_NS_BEGIN {
 uint64_t const Version =
     ((uint64_t)3 << 48) |
     ((uint64_t)8 << 32) |
-    ((uint64_t)32 << 16) |
+    ((uint64_t)249 << 16) |
     ((uint64_t)1);
 
 } MAT_NS_END
@@ -27,3 +27,4 @@ namespace PAL_NS_BEGIN { } PAL_NS_END
 
 #endif // RESOURCE_COMPILER_INVOKED
 #endif
+