From a7fdba8d77301ebee6d8b0bd20d0b0b929f45b6f Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud <68241710+a7medev@users.noreply.github.com> Date: Thu, 27 Apr 2023 16:33:11 +0200 Subject: [PATCH 01/13] [MOB-12247] Fix Sourcemaps Script with Old Gradle (#970) * Fix sourcemaps script with old Gradle * Update CHANGELOG * Update CHANGELOG --- CHANGELOG.md | 6 ++++++ android/sourcemaps.gradle | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 52d431175..63acf82b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v11.10.0...dev) + +### Fixed + +- Fix an issue with the Android sourcemaps upload script, causing the build to fail on older versions of Gradle ([#970](https://github.com/Instabug/Instabug-React-Native/pull/970)), closes [#969](https://github.com/Instabug/Instabug-React-Native/issues/969). + ## [11.10.0](https://github.com/Instabug/Instabug-React-Native/compare/v11.9.1...11.10.0) (April 20, 2023) ### Added diff --git a/android/sourcemaps.gradle b/android/sourcemaps.gradle index 9942703e0..5a524e411 100644 --- a/android/sourcemaps.gradle +++ b/android/sourcemaps.gradle @@ -5,7 +5,7 @@ def appProject = project(":app") gradle.projectsEvaluated { // Works for both `bundleReleaseJsAndAssets` and `createBundleReleaseJsAndAssets` def bundleTask = appProject.tasks.find { - task -> task.name.endsWithIgnoreCase('bundleReleaseJsAndAssets') + task -> task.name.toLowerCase().endsWith('bundlereleasejsandassets') } bundleTask.finalizedBy uploadSourcemaps From 2beb1f7cc233ea5b0916434f7e3482b38b57bd26 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud <68241710+a7medev@users.noreply.github.com> Date: Tue, 2 May 2023 14:46:02 +0300 Subject: [PATCH 02/13] [MOB-12305] Fix Sourcemaps Upload Script with Android Product Flavors (#975) --- CHANGELOG.md | 1 + android/sourcemaps.gradle | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 63acf82b9..ad2a8d1bd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixed - Fix an issue with the Android sourcemaps upload script, causing the build to fail on older versions of Gradle ([#970](https://github.com/Instabug/Instabug-React-Native/pull/970)), closes [#969](https://github.com/Instabug/Instabug-React-Native/issues/969). +- Fix an issue with the Android sourcemaps upload script, causing the build to fail when using product flavors ([#975](https://github.com/Instabug/Instabug-React-Native/pull/975)), closes [#974](https://github.com/Instabug/Instabug-React-Native/issues/974). ## [11.10.0](https://github.com/Instabug/Instabug-React-Native/compare/v11.9.1...11.10.0) (April 20, 2023) diff --git a/android/sourcemaps.gradle b/android/sourcemaps.gradle index 5a524e411..a974dda09 100644 --- a/android/sourcemaps.gradle +++ b/android/sourcemaps.gradle @@ -3,9 +3,9 @@ import org.apache.tools.ant.taskdefs.condition.Os def appProject = project(":app") gradle.projectsEvaluated { - // Works for both `bundleReleaseJsAndAssets` and `createBundleReleaseJsAndAssets` + // Works for both `bundleReleaseJsAndAssets` and `createBundleReleaseJsAndAssets` and product flavors def bundleTask = appProject.tasks.find { - task -> task.name.toLowerCase().endsWith('bundlereleasejsandassets') + task -> task.name.endsWith('ReleaseJsAndAssets') } bundleTask.finalizedBy uploadSourcemaps From 8a0c0503221a9359d70903932d1896bc9d9b21f1 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Thu, 11 May 2023 22:21:04 +0300 Subject: [PATCH 03/13] Use Android snapshot --- android/native.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/native.gradle b/android/native.gradle index 5a245bd77..d133e0dff 100644 --- a/android/native.gradle +++ b/android/native.gradle @@ -1,5 +1,5 @@ project.ext.instabug = [ - version: '11.11.0' + version: '11.11.0.4909777-SNAPSHOT' ] dependencies { From f269fbb7296b502b9027f00cf0a54d28c1986c36 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Thu, 11 May 2023 22:58:00 +0300 Subject: [PATCH 04/13] Use iOS snapshot --- RNInstabug.podspec | 2 +- examples/default/ios/Podfile | 2 ++ examples/default/ios/Podfile.lock | 15 ++++++++------- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/RNInstabug.podspec b/RNInstabug.podspec index 40c480f4c..7b73a05d3 100644 --- a/RNInstabug.podspec +++ b/RNInstabug.podspec @@ -16,5 +16,5 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm}" s.dependency 'React-Core' - use_instabug!(s) + # use_instabug!(s) end diff --git a/examples/default/ios/Podfile b/examples/default/ios/Podfile index 292e08f01..6a931353e 100644 --- a/examples/default/ios/Podfile +++ b/examples/default/ios/Podfile @@ -6,6 +6,8 @@ platform :ios, '11.0' target 'InstabugExample' do config = use_native_modules! + pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec' + use_react_native!( :path => config[:reactNativePath], # to enable hermes on iOS, change `false` to `true` and then install pods diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index c081d310f..8e1b6e87d 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -72,7 +72,7 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - Instabug (11.10.1) + - Instabug (11.10.4) - libevent (2.1.12) - OCMock (3.9.1) - OpenSSL-Universal (1.1.180) @@ -342,7 +342,6 @@ PODS: - React-logger (= 0.66.0) - React-perflogger (= 0.66.0) - RNInstabug (11.10.0): - - Instabug (= 11.10.1) - React-Core - RNScreens (3.20.0): - React-Core @@ -382,6 +381,7 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) + - Instabug (from `https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec`) - OCMock - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -429,7 +429,6 @@ SPEC REPOS: - Flipper-RSocket - FlipperKit - fmt - - Instabug - libevent - OCMock - OpenSSL-Universal @@ -446,6 +445,8 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/React/FBReactNativeSpec" glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" + Instabug: + :podspec: https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -524,7 +525,7 @@ SPEC CHECKSUMS: FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 5337263514dd6f09803962437687240c5dc39aa4 - Instabug: 8b0fcb6dd1bb91ae30a80176431d3e7f57ec3c4f + Instabug: 1e91a928d0dc4b03f1dbad28368182e55d4775f5 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b @@ -553,13 +554,13 @@ SPEC CHECKSUMS: React-RCTVibration: 53b92d54b923283638cb0186da7a5c2d2b70a49b React-runtimeexecutor: 4bb657a97aa74568d9ed634c8bd478299bb8a3a6 ReactCommon: eb059748e842a1a86025ebbd4ac9d99e74492f88 - RNInstabug: 461ac240d658da2727c01f89ddb5428842c950ca + RNInstabug: edbb7ae4d26ab6b64f7a5403cbd8d582497e25a5 RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 Yoga: c11abbf5809216c91fcd62f5571078b83d9b6720 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: 476a97b315e53c07a2d8fa2ea0455471001f56f5 +PODFILE CHECKSUM: de93e879142f63e148078e24b386b713365a7fdf -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 From a624db8b2c4c64445c77f7d5fd289bf31ee11ed0 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Thu, 11 May 2023 22:58:05 +0300 Subject: [PATCH 05/13] Use Android snapshot --- android/native.gradle | 2 +- examples/default/android/build.gradle | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/android/native.gradle b/android/native.gradle index d133e0dff..f59566f1c 100644 --- a/android/native.gradle +++ b/android/native.gradle @@ -1,5 +1,5 @@ project.ext.instabug = [ - version: '11.11.0.4909777-SNAPSHOT' + version: '11.11.0.4909006-SNAPSHOT' ] dependencies { diff --git a/examples/default/android/build.gradle b/examples/default/android/build.gradle index 4e6b39f2b..1b5bb5f35 100644 --- a/examples/default/android/build.gradle +++ b/examples/default/android/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. -subprojects { +subprojects { ext { compileSdk = rootProject.ext.compileSdkVersion minSdk = rootProject.ext.minSdkVersion @@ -68,5 +68,9 @@ allprojects { } google() maven { url 'https://www.jitpack.io' } + + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + } } } From 5f5e90d50d29c1ac43d12ac261831f876d52330d Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Thu, 11 May 2023 23:51:15 +0300 Subject: [PATCH 06/13] Add new locales --- .../java/com/instabug/reactlibrary/ArgsRegistry.java | 9 +++++++++ ios/RNInstabug/ArgsRegistry.m | 9 +++++++++ src/native/NativeConstants.ts | 9 +++++++++ src/utils/Enums.ts | 9 +++++++++ 4 files changed, 36 insertions(+) diff --git a/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java b/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java index c112d7c31..142846bef 100644 --- a/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java +++ b/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java @@ -163,28 +163,37 @@ static Map getAll() { static final ArgsMap locales = new ArgsMap() {{ put("localeArabic", InstabugLocale.ARABIC); put("localeAzerbaijani", InstabugLocale.AZERBAIJANI); + put("localeBulgarian", InstabugLocale.BULGARIAN); put("localeChineseSimplified", InstabugLocale.SIMPLIFIED_CHINESE); put("localeChineseTraditional", InstabugLocale.TRADITIONAL_CHINESE); + put("localeCroatian", InstabugLocale.CROATIAN); put("localeCzech", InstabugLocale.CZECH); put("localeDanish", InstabugLocale.DANISH); put("localeDutch", InstabugLocale.NETHERLANDS); put("localeEnglish", InstabugLocale.ENGLISH); + put("localeEstonian", InstabugLocale.ESTONIAN); put("localeFrench", InstabugLocale.FRENCH); put("localeGerman", InstabugLocale.GERMAN); + put("localeGreek", InstabugLocale.GREEK); put("localeIndonesian", InstabugLocale.INDONESIAN); put("localeItalian", InstabugLocale.ITALIAN); put("localeJapanese", InstabugLocale.JAPANESE); put("localeKorean", InstabugLocale.KOREAN); + put("localeLatvian", InstabugLocale.LATVIAN); + put("localeLithuanian", InstabugLocale.LITHUANIAN); put("localeNorwegian", InstabugLocale.NORWEGIAN); put("localePolish", InstabugLocale.POLISH); put("localePortugueseBrazil", InstabugLocale.PORTUGUESE_BRAZIL); put("localePortuguesePortugal", InstabugLocale.PORTUGUESE_PORTUGAL); put("localeRomanian", InstabugLocale.ROMANIAN); put("localeRussian", InstabugLocale.RUSSIAN); + put("localeSerbian", InstabugLocale.SERBIAN); put("localeSpanish", InstabugLocale.SPANISH); put("localeSlovak", InstabugLocale.SLOVAK); + put("localeSlovenian", InstabugLocale.SLOVENIAN); put("localeSwedish", InstabugLocale.SWEDISH); put("localeTurkish", InstabugLocale.TURKISH); + put("localeUkrainian", InstabugLocale.UKRAINIAN); }}; static final ArgsMap placeholders = new ArgsMap() {{ diff --git a/ios/RNInstabug/ArgsRegistry.m b/ios/RNInstabug/ArgsRegistry.m index 09317194a..aed4b5bee 100644 --- a/ios/RNInstabug/ArgsRegistry.m +++ b/ios/RNInstabug/ArgsRegistry.m @@ -158,24 +158,33 @@ + (ArgsDictionary *) locales { return @{ @"localeArabic": @(IBGLocaleArabic), @"localeAzerbaijani": @(IBGLocaleAzerbaijani), + @"localeBulgarian": @(IBGLocaleBulgarian), @"localeChineseSimplified": @(IBGLocaleChineseSimplified), @"localeChineseTraditional": @(IBGLocaleChineseTraditional), + @"localeCroatian": @(IBGLocaleCroatian), @"localeCzech": @(IBGLocaleCzech), @"localeDanish": @(IBGLocaleDanish), @"localeDutch": @(IBGLocaleDutch), @"localeEnglish": @(IBGLocaleEnglish), + @"localeEstonian": @(IBGLocaleEstonian), @"localeFrench": @(IBGLocaleFrench), @"localeGerman": @(IBGLocaleGerman), + @"localeGreek": @(IBGLocaleGreek), @"localeItalian": @(IBGLocaleItalian), @"localeJapanese": @(IBGLocaleJapanese), @"localeKorean": @(IBGLocaleKorean), + @"localeLatvian": @(IBGLocaleLatvian), + @"localeLithuanian": @(IBGLocaleLithuanian), @"localePolish": @(IBGLocalePolish), @"localePortugueseBrazil": @(IBGLocalePortugueseBrazil), @"localeRomanian": @(IBGLocaleRomanian), @"localeRussian": @(IBGLocaleRussian), + @"localeSerbian": @(IBGLocaleSerbian), @"localeSpanish": @(IBGLocaleSpanish), + @"localeSlovenian": @(IBGLocaleSlovenian), @"localeSwedish": @(IBGLocaleSwedish), @"localeTurkish": @(IBGLocaleTurkish), + @"localeUkrainian": @(IBGLocaleUkranian), }; } diff --git a/src/native/NativeConstants.ts b/src/native/NativeConstants.ts index 2d754bdbf..77dcf4a24 100644 --- a/src/native/NativeConstants.ts +++ b/src/native/NativeConstants.ts @@ -106,24 +106,33 @@ interface NativeReproStepsMode { interface NativeLocale { localeArabic: any; localeAzerbaijani: any; + localeBulgarian: any; localeChineseSimplified: any; localeChineseTraditional: any; + localeCroatian: any; localeCzech: any; localeDanish: any; localeDutch: any; localeEnglish: any; + localeEstonian: any; localeFrench: any; localeGerman: any; + localeGreek: any; localeItalian: any; localeJapanese: any; localeKorean: any; + localeLatvian: any; + localeLithuanian: any; localePolish: any; localePortugueseBrazil: any; localeRomanian: any; localeRussian: any; + localeSlovenian: any; localeSpanish: any; + localeSerbian: any; localeSwedish: any; localeTurkish: any; + localeUkrainian: any; } interface NativeStringKey { diff --git a/src/utils/Enums.ts b/src/utils/Enums.ts index bdae6fbbf..d279128a1 100644 --- a/src/utils/Enums.ts +++ b/src/utils/Enums.ts @@ -121,24 +121,33 @@ export enum ReproStepsMode { export enum Locale { arabic = constants.localeArabic, azerbaijani = constants.localeAzerbaijani, + bulgarian = constants.localeBulgarian, chineseSimplified = constants.localeChineseSimplified, chineseTraditional = constants.localeChineseTraditional, + croatian = constants.localeCroatian, czech = constants.localeCzech, danish = constants.localeDanish, dutch = constants.localeDutch, english = constants.localeEnglish, + estonian = constants.localeEstonian, french = constants.localeFrench, german = constants.localeGerman, + greek = constants.localeGreek, italian = constants.localeItalian, japanese = constants.localeJapanese, korean = constants.localeKorean, + latvian = constants.localeLatvian, + lithuanian = constants.localeLithuanian, polish = constants.localePolish, portugueseBrazil = constants.localePortugueseBrazil, romanian = constants.localeRomanian, russian = constants.localeRussian, + slovenian = constants.localeSlovenian, spanish = constants.localeSpanish, + serbian = constants.localeSerbian, swedish = constants.localeSwedish, turkish = constants.localeTurkish, + ukrainian = constants.localeUkrainian, } /** From ed9eebfb471f1f0e70d07ebfe7653afba58cb918 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Fri, 12 May 2023 00:00:50 +0300 Subject: [PATCH 07/13] Update CHANGELOG --- CHANGELOG.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad2a8d1bd..19aaed70f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,19 @@ ## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v11.10.0...dev) +### Added + +- Add support for more locales ([#979](https://github.com/Instabug/Instabug-React-Native/pull/979)): + 1. Bulgarian + 2. Croatian + 3. Estonian + 4. Greek + 5. Latvian + 6. Lithuanian + 7. Serbian + 8. Slovenian + 9. Ukrainian + ### Fixed - Fix an issue with the Android sourcemaps upload script, causing the build to fail on older versions of Gradle ([#970](https://github.com/Instabug/Instabug-React-Native/pull/970)), closes [#969](https://github.com/Instabug/Instabug-React-Native/issues/969). From eef1356b63fbf48eee30dd00f897fe37be31420b Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Fri, 12 May 2023 00:22:57 +0300 Subject: [PATCH 08/13] Revert CocoaPods version change in `Podfile.lock` --- examples/default/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index 8e1b6e87d..378e7c929 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -563,4 +563,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: de93e879142f63e148078e24b386b713365a7fdf -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 From 0a4f4346290a1495ea543d375cea38ebe16605fd Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Fri, 12 May 2023 00:39:44 +0300 Subject: [PATCH 09/13] Fix iOS snapshot installation --- RNInstabug.podspec | 1 + examples/default/ios/Podfile.lock | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/RNInstabug.podspec b/RNInstabug.podspec index 7b73a05d3..bc79639de 100644 --- a/RNInstabug.podspec +++ b/RNInstabug.podspec @@ -16,5 +16,6 @@ Pod::Spec.new do |s| s.source_files = "ios/**/*.{h,m,mm}" s.dependency 'React-Core' + s.dependency 'Instabug' # use_instabug!(s) end diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index 378e7c929..62ae42e66 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -342,6 +342,7 @@ PODS: - React-logger (= 0.66.0) - React-perflogger (= 0.66.0) - RNInstabug (11.10.0): + - Instabug - React-Core - RNScreens (3.20.0): - React-Core @@ -554,7 +555,7 @@ SPEC CHECKSUMS: React-RCTVibration: 53b92d54b923283638cb0186da7a5c2d2b70a49b React-runtimeexecutor: 4bb657a97aa74568d9ed634c8bd478299bb8a3a6 ReactCommon: eb059748e842a1a86025ebbd4ac9d99e74492f88 - RNInstabug: edbb7ae4d26ab6b64f7a5403cbd8d582497e25a5 + RNInstabug: e87ecb39e45510a4b2950120f79af8e8d1689b4a RNScreens: 218801c16a2782546d30bd2026bb625c0302d70f RNSVG: 551acb6562324b1d52a4e0758f7ca0ec234e278f RNVectorIcons: fcc2f6cb32f5735b586e66d14103a74ce6ad61f8 From 7110f0bfffa6e202d657ad259fb57e1f726b1378 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Mon, 15 May 2023 10:37:19 +0300 Subject: [PATCH 10/13] Maintain locales alphabetical order --- .../src/main/java/com/instabug/reactlibrary/ArgsRegistry.java | 2 +- ios/RNInstabug/ArgsRegistry.m | 2 +- src/utils/Enums.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java b/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java index 142846bef..5c2a4d39b 100644 --- a/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java +++ b/android/src/main/java/com/instabug/reactlibrary/ArgsRegistry.java @@ -188,9 +188,9 @@ static Map getAll() { put("localeRomanian", InstabugLocale.ROMANIAN); put("localeRussian", InstabugLocale.RUSSIAN); put("localeSerbian", InstabugLocale.SERBIAN); - put("localeSpanish", InstabugLocale.SPANISH); put("localeSlovak", InstabugLocale.SLOVAK); put("localeSlovenian", InstabugLocale.SLOVENIAN); + put("localeSpanish", InstabugLocale.SPANISH); put("localeSwedish", InstabugLocale.SWEDISH); put("localeTurkish", InstabugLocale.TURKISH); put("localeUkrainian", InstabugLocale.UKRAINIAN); diff --git a/ios/RNInstabug/ArgsRegistry.m b/ios/RNInstabug/ArgsRegistry.m index aed4b5bee..3fe307a6d 100644 --- a/ios/RNInstabug/ArgsRegistry.m +++ b/ios/RNInstabug/ArgsRegistry.m @@ -180,8 +180,8 @@ + (ArgsDictionary *) locales { @"localeRomanian": @(IBGLocaleRomanian), @"localeRussian": @(IBGLocaleRussian), @"localeSerbian": @(IBGLocaleSerbian), - @"localeSpanish": @(IBGLocaleSpanish), @"localeSlovenian": @(IBGLocaleSlovenian), + @"localeSpanish": @(IBGLocaleSpanish), @"localeSwedish": @(IBGLocaleSwedish), @"localeTurkish": @(IBGLocaleTurkish), @"localeUkrainian": @(IBGLocaleUkranian), diff --git a/src/utils/Enums.ts b/src/utils/Enums.ts index d279128a1..ccd27cc5e 100644 --- a/src/utils/Enums.ts +++ b/src/utils/Enums.ts @@ -142,9 +142,9 @@ export enum Locale { portugueseBrazil = constants.localePortugueseBrazil, romanian = constants.localeRomanian, russian = constants.localeRussian, + serbian = constants.localeSerbian, slovenian = constants.localeSlovenian, spanish = constants.localeSpanish, - serbian = constants.localeSerbian, swedish = constants.localeSwedish, turkish = constants.localeTurkish, ukrainian = constants.localeUkrainian, From 281908b57efdf87da59e690ec70af051b659fcb4 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Fri, 19 May 2023 11:02:36 +0300 Subject: [PATCH 11/13] Update iOS snapshot --- examples/default/ios/Podfile | 2 +- examples/default/ios/Podfile.lock | 12 ++++++------ ios/RNInstabug/ArgsRegistry.m | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/default/ios/Podfile b/examples/default/ios/Podfile index 6a931353e..0d2461516 100644 --- a/examples/default/ios/Podfile +++ b/examples/default/ios/Podfile @@ -6,7 +6,7 @@ platform :ios, '11.0' target 'InstabugExample' do config = use_native_modules! - pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec' + pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.5/Instabug.podspec' use_react_native!( :path => config[:reactNativePath], diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index 62ae42e66..cb242ab98 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -72,7 +72,7 @@ PODS: - FlipperKit/FlipperKitNetworkPlugin - fmt (6.2.1) - glog (0.3.5) - - Instabug (11.10.4) + - Instabug (11.10.5) - libevent (2.1.12) - OCMock (3.9.1) - OpenSSL-Universal (1.1.180) @@ -382,7 +382,7 @@ DEPENDENCIES: - FlipperKit/FlipperKitUserDefaultsPlugin (= 0.99.0) - FlipperKit/SKIOSNetworkPlugin (= 0.99.0) - glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`) - - Instabug (from `https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec`) + - Instabug (from `https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.5/Instabug.podspec`) - OCMock - RCT-Folly (from `../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec`) - RCTRequired (from `../node_modules/react-native/Libraries/RCTRequired`) @@ -447,7 +447,7 @@ EXTERNAL SOURCES: glog: :podspec: "../node_modules/react-native/third-party-podspecs/glog.podspec" Instabug: - :podspec: https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.4/Instabug.podspec + :podspec: https://ios-releases.instabug.com/custom/feature-add-more-languages/11.10.5/Instabug.podspec RCT-Folly: :podspec: "../node_modules/react-native/third-party-podspecs/RCT-Folly.podspec" RCTRequired: @@ -526,7 +526,7 @@ SPEC CHECKSUMS: FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: 5337263514dd6f09803962437687240c5dc39aa4 - Instabug: 1e91a928d0dc4b03f1dbad28368182e55d4775f5 + Instabug: fef0dcdf9ce55c668468c49f1caeba71d83beaf1 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8 OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b @@ -562,6 +562,6 @@ SPEC CHECKSUMS: Yoga: c11abbf5809216c91fcd62f5571078b83d9b6720 YogaKit: f782866e155069a2cca2517aafea43200b01fd5a -PODFILE CHECKSUM: de93e879142f63e148078e24b386b713365a7fdf +PODFILE CHECKSUM: 3fdfd26f20172910b20c4095ffb244799bee5ec0 -COCOAPODS: 1.11.3 +COCOAPODS: 1.12.1 diff --git a/ios/RNInstabug/ArgsRegistry.m b/ios/RNInstabug/ArgsRegistry.m index 3fe307a6d..cfe8099f8 100644 --- a/ios/RNInstabug/ArgsRegistry.m +++ b/ios/RNInstabug/ArgsRegistry.m @@ -184,7 +184,7 @@ + (ArgsDictionary *) locales { @"localeSpanish": @(IBGLocaleSpanish), @"localeSwedish": @(IBGLocaleSwedish), @"localeTurkish": @(IBGLocaleTurkish), - @"localeUkrainian": @(IBGLocaleUkranian), + @"localeUkrainian": @(IBGLocaleUkrainian), }; } From 1adcad2eec89edc132c260597b593cecf1ff3be7 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Mon, 22 May 2023 13:16:40 +0300 Subject: [PATCH 12/13] Fix CocoaPods version in `Podfile.lock` --- examples/default/ios/Podfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/default/ios/Podfile.lock b/examples/default/ios/Podfile.lock index cb242ab98..a903bd413 100644 --- a/examples/default/ios/Podfile.lock +++ b/examples/default/ios/Podfile.lock @@ -564,4 +564,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3fdfd26f20172910b20c4095ffb244799bee5ec0 -COCOAPODS: 1.12.1 +COCOAPODS: 1.11.3 From 2f721092e8ef3aa396f4ed3271adc817482efd76 Mon Sep 17 00:00:00 2001 From: Ahmed Mahmoud Date: Tue, 23 May 2023 11:13:24 +0300 Subject: [PATCH 13/13] Add locales to deprecated `ArgsRegistry` as well --- src/utils/ArgsRegistry.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/utils/ArgsRegistry.ts b/src/utils/ArgsRegistry.ts index 08b52b7cd..9ffb8f2e7 100644 --- a/src/utils/ArgsRegistry.ts +++ b/src/utils/ArgsRegistry.ts @@ -173,24 +173,33 @@ export enum reproStepsMode { export enum locale { arabic = constants.localeArabic, azerbaijani = constants.localeAzerbaijani, + bulgarian = constants.localeBulgarian, chineseSimplified = constants.localeChineseSimplified, chineseTraditional = constants.localeChineseTraditional, + croatian = constants.localeCroatian, czech = constants.localeCzech, danish = constants.localeDanish, dutch = constants.localeDutch, english = constants.localeEnglish, + estonian = constants.localeEstonian, french = constants.localeFrench, german = constants.localeGerman, + greek = constants.localeGreek, italian = constants.localeItalian, japanese = constants.localeJapanese, korean = constants.localeKorean, + latvian = constants.localeLatvian, + lithuanian = constants.localeLithuanian, polish = constants.localePolish, portugueseBrazil = constants.localePortugueseBrazil, romanian = constants.localeRomanian, russian = constants.localeRussian, + serbian = constants.localeSerbian, + slovenian = constants.localeSlovenian, spanish = constants.localeSpanish, swedish = constants.localeSwedish, turkish = constants.localeTurkish, + ukrainian = constants.localeUkrainian, } /**