From 255406405157b047594f4e02fd13fb592bec254c Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:15:42 +0100 Subject: [PATCH 1/7] update bundle dependencies --- Gemfile.lock | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index df892ce61..6664fb1c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -65,7 +65,7 @@ GEM httpclient (2.8.3) i18n (1.12.0) concurrent-ruby (~> 1.0) - jazzy (0.13.5) + jazzy (0.13.7) cocoapods (~> 1.5) mustache (~> 1.1) open4 @@ -76,6 +76,7 @@ GEM xcinvoke (~> 0.3.0) json (2.6.3) liferaft (0.0.6) + mini_portile2 (2.8.1) minitest (5.17.0) molinillo (0.8.0) mustache (1.1.1) @@ -84,16 +85,17 @@ GEM naturally (1.3.2) netrc (0.11.0) open4 (1.3.4) - plist (3.5.0) + plist (3.6.0) public_suffix (4.0.7) - rake (13.0.1) - redcarpet (3.5.0) + rake (13.0.6) + redcarpet (3.6.0) rexml (3.2.5) rouge (2.0.7) ruby-macho (2.5.1) sassc (2.4.0) ffi (~> 1.9) - sqlite3 (1.4.2) + sqlite3 (1.6.0) + mini_portile2 (~> 2.8.0) typhoeus (1.4.0) ethon (>= 0.9.0) tzinfo (2.0.6) @@ -109,7 +111,7 @@ GEM rexml (~> 3.2.4) xcpretty (0.3.0) rouge (~> 2.0.7) - zeitwerk (2.6.6) + zeitwerk (2.6.7) PLATFORMS ruby @@ -122,4 +124,4 @@ DEPENDENCIES xcpretty BUNDLED WITH - 2.1.4 + 2.4.7 From 03b102dfec1bf4a93db477ad3eb864295107d887 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:23:28 +0100 Subject: [PATCH 2/7] upgrade ios simulator for test --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 649ca0e52..f0c914c66 100644 --- a/Rakefile +++ b/Rakefile @@ -15,7 +15,7 @@ build_folder = File.join(script_folder, 'build') release_folder = File.join(build_folder, 'release') bolts_build_folder = File.join(script_folder, 'Carthage', 'Build') bolts_folder = File.join(script_folder, 'Carthage', 'Checkouts', 'Bolts-ObjC') -ios_simulator = 'platform="iOS Simulator",name="iPhone 11"' +ios_simulator = 'platform="iOS Simulator",name="iPhone 14"' tvos_simulator = 'platform="tvOS Simulator",name="Apple TV 4K"' module Constants From 8fe9690efd7c8f7cffd21ffeeb5187261097999e Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:23:32 +0100 Subject: [PATCH 3/7] Update CONTRIBUTING.md --- CONTRIBUTING.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a5cabbaec..d6d6c24f3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -30,9 +30,7 @@ For analyzing bugs, creating bug fixes and features we recommend to clone this r ``` bundle exec rake test:ios ``` - Check the Rakefile and the circleci config for more information. - -5. Make sure your code follows the [style guide](#style-guide). + Check the [Rakefile](Rakefile) and the [GitHub workflows](.github/workflows) for more information. # Bugs From 6da185fe8685f74545f9b75b0ae4277ca2a8591b Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:37:55 +0100 Subject: [PATCH 4/7] code style --- Parse/Parse/Resources/Parse-tvOS.Info.plist | 2 +- Parse/Parse/Resources/Parse-watchOS.Info.plist | 2 +- .../OSX/ParseOSXStarterProject-Swift/Resources/Info.plist | 2 +- .../OSX/ParseOSXStarterProject/Resources/Info.plist | 2 +- .../iOS/ParseStarterProject/Resources/Info.plist | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Parse/Parse/Resources/Parse-tvOS.Info.plist b/Parse/Parse/Resources/Parse-tvOS.Info.plist index e9718f145..1a902e2ff 100644 --- a/Parse/Parse/Resources/Parse-tvOS.Info.plist +++ b/Parse/Parse/Resources/Parse-tvOS.Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 2.0.2 NSPrincipalClass - + diff --git a/Parse/Parse/Resources/Parse-watchOS.Info.plist b/Parse/Parse/Resources/Parse-watchOS.Info.plist index e9718f145..1a902e2ff 100644 --- a/Parse/Parse/Resources/Parse-watchOS.Info.plist +++ b/Parse/Parse/Resources/Parse-watchOS.Info.plist @@ -21,6 +21,6 @@ CFBundleVersion 2.0.2 NSPrincipalClass - + diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist index f67769bcd..832c3def1 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject-Swift/Resources/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIconFile - + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist index c799f8e79..bed35a85c 100644 --- a/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist +++ b/ParseStarterProject/OSX/ParseOSXStarterProject/Resources/Info.plist @@ -7,7 +7,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist index 9664016af..03fd71aa8 100644 --- a/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist +++ b/ParseStarterProject/iOS/ParseStarterProject/Resources/Info.plist @@ -9,7 +9,7 @@ CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile - + CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion From 824fed0ca457e064aa20691e00778146bbce18cf Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:38:02 +0100 Subject: [PATCH 5/7] readme typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index acdef8977..a7f601a05 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ Take a look at the public [documentation][docs] & [API][api] and start building. #### Download Builds -Dowload the compiled builds from the asset section in the [releases][releases] page. +Download the compiled builds from the asset section in the [releases][releases] page. #### Compile Source From 0220371f1079fd62184e15e71ad558916a9c305b Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:47:56 +0100 Subject: [PATCH 6/7] add pkg-config --- Gemfile | 1 + Gemfile.lock | 2 ++ 2 files changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 4edc6d84f..3a50a4231 100644 --- a/Gemfile +++ b/Gemfile @@ -5,3 +5,4 @@ gem 'naturally', '~> 1.3.2' gem 'jazzy', '~> 0.13.5' gem 'xcpretty' gem 'rake' +gem 'pkg-config' diff --git a/Gemfile.lock b/Gemfile.lock index 6664fb1c9..f5bfd4804 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ GEM naturally (1.3.2) netrc (0.11.0) open4 (1.3.4) + pkg-config (1.5.1) plist (3.6.0) public_suffix (4.0.7) rake (13.0.6) @@ -119,6 +120,7 @@ PLATFORMS DEPENDENCIES jazzy (~> 0.13.5) naturally (~> 1.3.2) + pkg-config plist rake xcpretty From 569d125a1b4630bd342f240d7cdd8d16c0060075 Mon Sep 17 00:00:00 2001 From: Manuel Trezza <5673677+mtrezza@users.noreply.github.com> Date: Mon, 20 Feb 2023 12:51:34 +0100 Subject: [PATCH 7/7] Revert "add pkg-config" This reverts commit 0220371f1079fd62184e15e71ad558916a9c305b. --- Gemfile | 1 - Gemfile.lock | 2 -- 2 files changed, 3 deletions(-) diff --git a/Gemfile b/Gemfile index 3a50a4231..4edc6d84f 100644 --- a/Gemfile +++ b/Gemfile @@ -5,4 +5,3 @@ gem 'naturally', '~> 1.3.2' gem 'jazzy', '~> 0.13.5' gem 'xcpretty' gem 'rake' -gem 'pkg-config' diff --git a/Gemfile.lock b/Gemfile.lock index f5bfd4804..6664fb1c9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,7 +85,6 @@ GEM naturally (1.3.2) netrc (0.11.0) open4 (1.3.4) - pkg-config (1.5.1) plist (3.6.0) public_suffix (4.0.7) rake (13.0.6) @@ -120,7 +119,6 @@ PLATFORMS DEPENDENCIES jazzy (~> 0.13.5) naturally (~> 1.3.2) - pkg-config plist rake xcpretty