Merge branch 'develop' into fix/set-correct-cs-to-new-groups-cherry-p…

…ick-cherry-pick
wireapp · Jun 11, 2024 · 3b5fb55 · 3b5fb55
2 parents ab385da + 771a409
commit 3b5fb55
Show file tree

Hide file tree

Showing 41 changed files with 360 additions and 595 deletions.
diff --git a/.github/workflows/gradle-android-unit-tests.yml b/.github/workflows/gradle-android-unit-tests.yml
@@ -30,7 +30,7 @@ jobs:
                     cache: gradle
 
             -   name: Gradle Setup
-                uses: gradle/gradle-build-action@v2
+                uses: gradle/gradle-build-action@v3
 
             -   name: Validate Gradle wrapper
                 uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b

diff --git a/.github/workflows/gradle-ios-tests.yml b/.github/workflows/gradle-ios-tests.yml
@@ -35,7 +35,7 @@ jobs:
           python-version: '3.11'
 
       - name: Gradle Setup
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
 
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b

diff --git a/cryptography/src/androidMain/jni/Android.mk b/cryptography/src/androidMain/jni/Android.mk
diff --git a/cryptography/src/androidMain/jni/Application.mk b/cryptography/src/androidMain/jni/Application.mk
diff --git a/cryptography/src/androidMain/jni/LzwDecoder.cpp b/cryptography/src/androidMain/jni/LzwDecoder.cpp
diff --git a/cryptography/src/androidMain/jni/LzwDecoder.h b/cryptography/src/androidMain/jni/LzwDecoder.h
diff --git a/cryptography/src/androidMain/jni/arm64-v8a/libsodium.so b/cryptography/src/androidMain/jni/arm64-v8a/libsodium.so
diff --git a/cryptography/src/androidMain/jni/armeabi-v7a/libsodium.so b/cryptography/src/androidMain/jni/armeabi-v7a/libsodium.so
diff --git a/cryptography/src/androidMain/jni/randombytes.c b/cryptography/src/androidMain/jni/randombytes.c
diff --git a/cryptography/src/androidMain/jni/sodium/core.h b/cryptography/src/androidMain/jni/sodium/core.h