From 4b9f010a454147e8eef281b9866f3c7d8e4c7a35 Mon Sep 17 00:00:00 2001
From: Rui Ying <git@ruiying.io>
Date: Sun, 14 Aug 2022 20:07:15 -0700
Subject: [PATCH] v13.14.0

---
 android/app/build.gradle             | 15 ++++++++++-----
 android/build.gradle                 |  6 ++++++
 ios/Podfile                          |  5 +++++
 ios/Podfile.lock                     |  2 +-
 ios/learnX.xcodeproj/project.pbxproj |  8 ++++----
 package.json                         |  2 +-
 6 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/android/app/build.gradle b/android/app/build.gradle
index d617c7f8..8d9ac46e 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -25,20 +25,25 @@ def reactNativeArchitectures() {
 }
 
 android {
-    ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
+    ndkVersion rootProject.ext.ndkVersion
+    externalNativeBuild {
+        cmake {
+            version rootProject.ext.cmakeVersion
+        }
+    }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_18
-        targetCompatibility = JavaVersion.VERSION_18
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     defaultConfig {
         applicationId "io.robertying.learnx"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 9202310
-        versionName "13.13.0"
+        versionCode 9202330
+        versionName "13.14.0"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 
         if (isNewArchitectureEnabled()) {
diff --git a/android/build.gradle b/android/build.gradle
index 7b7beb53..c3db538e 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -5,6 +5,7 @@ buildscript {
         compileSdkVersion = 33
         targetSdkVersion = 33
         ndkVersion = "25.0.8775105"
+        cmakeVersion = "3.22.1"
         kotlinVersion = "1.7.10"
     }
     repositories {
@@ -43,6 +44,11 @@ subprojects { subproject ->
                 buildToolsVersion "33.0.0"
                 compileSdkVersion 33
                 ndkVersion "25.0.8775105"
+                externalNativeBuild {
+                    cmake {
+                        version "3.22.1"
+                    }
+                }
             }
         }
     }
diff --git a/ios/Podfile b/ios/Podfile
index b27dbede..8ff7548b 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -38,6 +38,11 @@ target 'learnX' do
       target.build_configurations.each do |config|
         config.build_settings.delete 'IPHONEOS_DEPLOYMENT_TARGET'
       end
+      if target.respond_to?(:product_type) and target.product_type == 'com.apple.product-type.bundle'
+        target.build_configurations.each do |config|
+          config.build_settings['CODE_SIGN_IDENTITY[sdk=macosx*]'] = '-'
+        end
+      end
     end
 
     installer.pods_project.build_configurations.each do |config|
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index a05dfd84..9f982269 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -656,6 +656,6 @@ SPEC CHECKSUMS:
   SSZipArchive: 62d4947b08730e4cda640473b0066d209ff033c9
   Yoga: ff994563b2fd98c982ca58e8cd9db2cdaf4dda74
 
-PODFILE CHECKSUM: 1954ad9ad88fad85fde41973f398fabf5cd2d644
+PODFILE CHECKSUM: fda234aeaf5e12d5624a8aca672e86b4e2886f89
 
 COCOAPODS: 1.11.3
diff --git a/ios/learnX.xcodeproj/project.pbxproj b/ios/learnX.xcodeproj/project.pbxproj
index 851d3a66..ebbb062a 100644
--- a/ios/learnX.xcodeproj/project.pbxproj
+++ b/ios/learnX.xcodeproj/project.pbxproj
@@ -316,7 +316,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = learnX/learnX.entitlements;
-				CURRENT_PROJECT_VERSION = 2310;
+				CURRENT_PROJECT_VERSION = 2331;
 				DEVELOPMENT_TEAM = QX9PZ6H89F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = learnX/Info.plist;
@@ -325,7 +325,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 13.13.0;
+				MARKETING_VERSION = 13.14.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -349,7 +349,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = learnX/learnX.entitlements;
-				CURRENT_PROJECT_VERSION = 2310;
+				CURRENT_PROJECT_VERSION = 2331;
 				DEVELOPMENT_TEAM = QX9PZ6H89F;
 				INFOPLIST_FILE = learnX/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
@@ -357,7 +357,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 13.13.0;
+				MARKETING_VERSION = 13.14.0;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
diff --git a/package.json b/package.json
index 9125eefe..02f89bd6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "learnX",
-  "version": "13.13.0",
+  "version": "13.14.0",
   "private": true,
   "scripts": {
     "postinstall": "patch-package && chmod +x scripts/fix_react_native_interactable.sh && ./scripts/fix_react_native_interactable.sh",