Migs647/carthage fix 2 (#78)

* Updated Carthage to use analytics 4.0.x

* Moved Carthage files to proper location

Author: migs647

.circleci/config.yml

@@ -2,18 +2,16 @@ version: 2
 jobs:
   build-and-test:
     macos:
-      xcode: "9.4.1"
+      xcode: "11.5.0"
     steps:
       - checkout
       - run: xcrun simctl list
-      - run:
-          name: Fetch Cocoapods specs
-          command: curl https://cocoapods-specs.circleci.com/fetch-cocoapods-repo-from-s3.sh | bash -s cf
       - run:
           name: Install dependencies
           command: |
             sudo gem install xcpretty
-            sudo gem install cocoapods -v 1.3.1
+            sudo gem install cocoapods
+            sudo gem install cocoapods-repo-update
             make install
       - run:
           name: Run tests

.gitignore

@@ -22,8 +22,8 @@ DerivedData
 # Bundler
 .bundle
 
-Carthage/Carthage
-Carthage/Archive.zip
+Carthage
+Archive.zip
 # We recommend against adding the Pods directory to your .gitignore. However
 # you should judge for yourself, the pros and cons are mentioned at:
 # http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control

Carthage/Cartfile renamed to Cartfile

@@ -1,2 +1,2 @@
 github "amplitude/Amplitude-iOS"
-github "segmentio/analytics-ios"
+github "segmentio/analytics-ios"

Carthage/Cartfile.resolved renamed to Cartfile.resolved

@@ -1,2 +1,2 @@
 github "amplitude/Amplitude-iOS" "v5.2.1"
-github "segmentio/analytics-ios" "4.0.3"
+github "segmentio/analytics-ios" "4.0.4"