Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
b8748fd
Parse UI builds on iOS 8.0. Carthage uses parse-community/bolts-objc
noobs2ninjas Dec 4, 2019
5ee2061
Updating gitignore to remove vendor file.
noobs2ninjas Dec 4, 2019
53b7c23
Removing vendor files.
noobs2ninjas Dec 4, 2019
27bfe84
Migrating to base internationalizm. Removing depricated reguions.
noobs2ninjas Dec 4, 2019
912dc29
Updating each target to only support only its platform.
noobs2ninjas Dec 4, 2019
5668aec
Revert "Updating each target to only support only its platform."
noobs2ninjas Dec 4, 2019
359ba41
Updating rakefile to try and fix circleCI build.
noobs2ninjas Dec 4, 2019
87b9c6b
Fixing Apple TV scripts for circle and travis builds.
noobs2ninjas Dec 4, 2019
78e8dc0
Fixing TVOS Version
noobs2ninjas Dec 4, 2019
9fc696d
Updating travis xcode environment
noobs2ninjas Dec 4, 2019
f3e3b2e
Updating circle ci environment.
noobs2ninjas Dec 4, 2019
314095a
updating travis one last time with proper sim runtime.
noobs2ninjas Dec 4, 2019
eb272f5
trying to fix local bundleer issue
noobs2ninjas Dec 4, 2019
b2dc483
Updating circle for macOS 10.15
noobs2ninjas Dec 4, 2019
75e9f44
removing bash command
noobs2ninjas Dec 4, 2019
d628aa9
trying to fix xcode env
noobs2ninjas Dec 4, 2019
1a1850b
trying another fix for bash issue
noobs2ninjas Dec 4, 2019
77e4f7c
Dumb echo
noobs2ninjas Dec 4, 2019
1da751e
ruby version
noobs2ninjas Dec 4, 2019
c3f9a2e
running bundler locally
noobs2ninjas Dec 4, 2019
848d758
Fixing travis simulator and gem path.
noobs2ninjas Dec 4, 2019
9837cd4
still trying to fix path issues
noobs2ninjas Dec 4, 2019
032c403
Still trying to fix catalina issues
noobs2ninjas Dec 4, 2019
7c12d86
still trying to fix config
noobs2ninjas Dec 4, 2019
31ac933
Fixing simulator versions
noobs2ninjas Dec 4, 2019
5ee4fd9
Adding bolts_folder back.
noobs2ninjas Dec 4, 2019
f75f4b4
Missed a few simulator OS version updates.
noobs2ninjas Dec 5, 2019
e9ef6bc
Updating project settings.
noobs2ninjas Dec 10, 2019
f0909f0
removing modules to update carthage
noobs2ninjas Dec 10, 2019
4acb88f
Updating carthage
noobs2ninjas Dec 10, 2019
dcd78b9
Updating to latest version of bolts.
noobs2ninjas Dec 10, 2019
49b8384
Adding xctoolchain back to submodules
noobs2ninjas Dec 10, 2019
f8c4fd5
Attempting to fix facebook test.
noobs2ninjas Dec 10, 2019
6b79dfb
Revert "Attempting to fix facebook test."
noobs2ninjas Dec 10, 2019
f6c21da
Returning Code coverage to original state.
noobs2ninjas Dec 10, 2019
a67b460
fixing destinations for macOS and removing OS version for iPhone.
noobs2ninjas Jan 3, 2020
b18f6a2
Fixing macOS build
noobs2ninjas Jan 3, 2020
e11fb8a
Fix iOS, twitter, facebook builds.
noobs2ninjas Jan 3, 2020
17643a2
Adding OS=13.2.2 back for Travis release
noobs2ninjas Jan 3, 2020
a375929
fixing xcode version
noobs2ninjas Jan 3, 2020
feb91cd
Final destination fixes
noobs2ninjas Jan 3, 2020
3324fac
simplifying destinations
noobs2ninjas Jan 3, 2020
5634c59
Adding quotations back
noobs2ninjas Jan 3, 2020
6bec35b
Last tweak for jazzy publishing
noobs2ninjas Jan 3, 2020
538dbd0
Changing OS version for Circle specifically.
noobs2ninjas Jan 3, 2020
a50b9b5
removing vendor
noobs2ninjas Jan 3, 2020
76b2b19
Adding Back
noobs2ninjas Jan 3, 2020
9bae0fe
removing carthage files
noobs2ninjas Jan 3, 2020
737a3bf
updating
noobs2ninjas Jan 3, 2020
7fb2205
updating gitmodules
noobs2ninjas Jan 3, 2020
6506927
Adding carthage files back
noobs2ninjas Jan 3, 2020
c39b702
updating toolchain
noobs2ninjas Jan 3, 2020
d17942b
updating xctoolchain. Travis didnt update TVOS
noobs2ninjas Jan 3, 2020
174bf0d
Removing simulator create
noobs2ninjas Jan 3, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
defaults: &defaults
macos:
xcode: "11.0.0"
xcode: "11.2.1"
shell: /bin/bash --login -eo pipefail
aliases:
- &prepare
Expand All @@ -19,6 +19,7 @@ jobs:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:ios
- run: bash <(curl -s https://codecov.io/bash)
Expand All @@ -28,6 +29,7 @@ jobs:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run:
name: "Create and set the default keychain"
Expand All @@ -47,6 +49,7 @@ jobs:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:facebook_utils:ios
- run: bash <(curl -s https://codecov.io/bash)
Expand All @@ -56,6 +59,7 @@ jobs:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:twitter_utils:ios
- run: bash <(curl -s https://codecov.io/bash)
Expand All @@ -65,6 +69,7 @@ jobs:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:parseui:all
- run: bash <(curl -s https://codecov.io/bash)
Expand All @@ -76,24 +81,27 @@ jobs:
- checkout
- run: *prepare
- run: |
xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
xcrun simctl create "Apple TV 4K" com.apple.CoreSimulator.SimDeviceType.Apple-TV-4K-4K com.apple.CoreSimulator.SimRuntime.tvOS-13-2
bundle exec rake package:release
jazzy:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: ./Scripts/jazzy.sh
carthage:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:carthage
cocoapods:
<<: *defaults
steps:
- checkout
- run: echo 'chruby ruby-2.6' >> ~/.bash_profile
- run: *prepare
- run: bundle exec rake test:cocoapods

Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,4 @@ docs/
## AppCode
.idea/
ParseFacebookUtils/Vendor
ParseUI/Vendor
11 changes: 4 additions & 7 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
[submodule "Carthage/Checkouts/OCMock"]
path = Carthage/Checkouts/OCMock
url = https://github.com/erikdoe/OCMock.git
[submodule "Vendor/xctoolchain"]
path = Vendor/xctoolchain
url = https://github.com/parse-community/xctoolchain.git
[submodule "Carthage/Checkouts/Bolts-ObjC"]
path = Carthage/Checkouts/Bolts-ObjC
url = https://github.com/BoltsFramework/Bolts-ObjC.git
url = https://github.com/parse-community/Bolts-ObjC.git
[submodule "Carthage/Checkouts/facebook-objc-sdk"]
path = Carthage/Checkouts/facebook-objc-sdk
url = https://github.com/facebook/facebook-objc-sdk.git
[submodule "Vendor/xctoolchain"]
path = Vendor/xctoolchain
url = https://github.com/parse-community/xctoolchain.git
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.6.3
ruby-2.6
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: objective-c
os: osx
osx_image: xcode11
osx_image: xcode11.2
branches:
only:
- master
Expand All @@ -18,7 +18,6 @@ jobs:
install: bundle install
script:
- ./Scripts/jazzy.sh
- xcrun simctl create "Apple TV 1080p" com.apple.CoreSimulator.SimDeviceType.Apple-TV-1080p com.apple.CoreSimulator.SimRuntime.tvOS-12-2
- bundle exec rake package:release
deploy:
- provider: releases
Expand Down
4 changes: 2 additions & 2 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
github "BoltsFramework/Bolts-ObjC" ~> 1.9
github "facebook/facebook-objc-sdk" ~> 5.2
github "parse-community/Bolts-ObjC" ~> 1.9.1
github "facebook/facebook-objc-sdk" ~> 5.12.0
1 change: 0 additions & 1 deletion Cartfile.private

This file was deleted.

5 changes: 2 additions & 3 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
github "BoltsFramework/Bolts-ObjC" "1.9.0"
github "erikdoe/OCMock" "v3.4.3"
github "facebook/facebook-objc-sdk" "v5.6.0"
github "facebook/facebook-objc-sdk" "v5.13.1"
github "parse-community/Bolts-ObjC" "1.9.1"
1 change: 0 additions & 1 deletion Carthage/Checkouts/OCMock
Submodule OCMock deleted from 62fd0b
2 changes: 1 addition & 1 deletion Carthage/Checkouts/facebook-objc-sdk
2 changes: 1 addition & 1 deletion Parse.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ Pod::Spec.new do |s|
s.subspec 'UI' do |s|
s.platform = :ios
s.requires_arc = true
s.ios.deployment_target = '9.0'
s.ios.deployment_target = '8.0'
s.source_files = 'ParseUI/**/*.{h,m}'
s.exclude_files = 'ParseUI/ParseUIDemo/**/*', 'ParseUI/Other/ParseUI.h'
s.public_header_files = 'ParseUI/Classes/LogInViewController/*.h',
Expand Down
124 changes: 124 additions & 0 deletions Parse.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>BuildSystemType</key>
<string>Original</string>
<string>Latest</string>
<key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
<false/>
</dict>
Expand Down
Loading