Remove traces of Cocoapods and removed xcworkspace

glm4 · glm4 · commit 2eb92b823e64 · 2023-07-14T13:55:58.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -66,6 +66,3 @@ report.junit
 
 # Private keys
 secrets.xcconfig
-
-R.generated.swift
-
diff --git a/.slather.yml b/.slather.yml
@@ -1,10 +1,8 @@
 coverage_service: cobertura_xml
-workspace: ios-base.xcworkspace
 xcodeproj: ios-base.xcodeproj
 scheme: ios-base-develop
 binary_basename: ios-base-Debug
 ignore:
   - Pods/*
   - ios-base/Extensions/UIImageExtension.swift
-  - R.generated.swift
   - ios-base/AppDelegate.swift
diff --git a/.travis.yml b/.travis.yml
@@ -3,28 +3,24 @@ env:
     - CC_TEST_REPORTER_ID: 8454035bac667725e88752aa44de9ee72dc53982138c3d0c3def3843b9191568
     - GIT_COMMITTED_AT=$(if [ "$TRAVIS_PULL_REQUEST" == "false" ]; then git log -1 --pretty=format:%ct; else git log -1 --skip 1 --pretty=format:%ct; fi)
   jobs:
-    - IOS=11.4, DEVICE_NAME="iPhone 8"
-    - IOS=12.4, DEVICE_NAME="iPhone 8"
-    - IOS=13.4, DEVICE_NAME="iPhone 8"
-    - IOS=13.4, DEVICE_NAME="iPhone 11 Pro"
-    - IOS=13.4, DEVICE_NAME="iPhone 11 Pro Max"
-osx_image: xcode11.5
+    - IOS=15.5, DEVICE_NAME="iPhone 13"
+    - IOS=16.0, DEVICE_NAME="iPhone 13 Pro"
+    - IOS=16.4, DEVICE_NAME="iPhone 14"
+    - IOS=13.4, DEVICE_NAME="iPhone 14 Pro"
+    - IOS=13.4, DEVICE_NAME="iPhone 14 Pro Max"
+osx_image: xcode14.3
 language: swift
 cache:
   - bundler
-  - cocoapods
-before_install:
-  - pod repo update
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 install:
   - bundle install
-  - pod install
 script:
   - set -o pipefail
-  - xcodebuild -workspace ios-base.xcworkspace -scheme ios-base-develop -destination "platform=iOS Simulator,name=$DEVICE_NAME,OS=$IOS" build test | xcpretty --test --color
+  - xcodebuild -project ios-base.xcodeproj -scheme ios-base-develop -destination "platform=iOS Simulator,name=$DEVICE_NAME,OS=$IOS" build test | xcpretty --test --color
 after_script:
   - slather coverage
   - ./cc-test-reporter after-build -t cobertura --exit-code $TRAVIS_TEST_RESULT
diff --git a/Gemfile b/Gemfile
@@ -2,6 +2,5 @@ source 'https://rubygems.org'
 
 gem 'slather'
 gem "fastlane"
-gem "cocoapods"
 plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile')
 eval_gemfile(plugins_path) if File.exist?(plugins_path)
diff --git a/ios-base.xcodeproj/project.pbxproj b/ios-base.xcodeproj/project.pbxproj
@@ -680,11 +680,11 @@
 			);
 			mainGroup = 9B5AFAD11C7205EB002347D6;
 			packageReferences = (
-				24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager" */,
+				24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */,
 				24514AA02A55BE5A003D686E /* XCRemoteSwiftPackageReference "facebook-ios-sdk" */,
 				24514AAD2A55C7CC003D686E /* XCRemoteSwiftPackageReference "RSSwiftNetworking" */,
-				24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
-				24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter" */,
+				24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk.git" */,
+				24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter.git" */,
 				24D6CFBF2A5E074E00D1EFA2 /* XCRemoteSwiftPackageReference "RSFontSizes" */,
 			);
 			productRefGroup = 9B5AFADB1C7205EC002347D6 /* Products */;
@@ -1502,7 +1502,7 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager" */ = {
+		24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/hackiftekhar/IQKeyboardManager.git";
 			requirement = {
@@ -1526,15 +1526,15 @@
 				version = 1.1.0;
 			};
 		};
-		24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
+		24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk.git" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
 			requirement = {
 				kind = exactVersion;
 				version = 8.6.0;
 			};
 		};
-		24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter" */ = {
+		24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter.git" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/httpswift/swifter.git";
 			requirement = {
@@ -1546,16 +1546,16 @@
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/rootstrap/RSFontSizes";
 			requirement = {
-				kind = upToNextMajorVersion;
-				minimumVersion = 1.0.0;
+				branch = master;
+				kind = branch;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
 		24514A9E2A55BC16003D686E /* IQKeyboardManagerSwift */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager" */;
+			package = 24514A9D2A55BC16003D686E /* XCRemoteSwiftPackageReference "IQKeyboardManager.git" */;
 			productName = IQKeyboardManagerSwift;
 		};
 		24514AA12A55BE5A003D686E /* FacebookCore */ = {
@@ -1580,17 +1580,17 @@
 		};
 		24D6CFB82A5C9D9000D1EFA2 /* FirebaseAnalytics */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
+			package = 24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk.git" */;
 			productName = FirebaseAnalytics;
 		};
 		24D6CFBA2A5C9D9000D1EFA2 /* FirebaseCrashlytics */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
+			package = 24D6CFB72A5C9D9000D1EFA2 /* XCRemoteSwiftPackageReference "firebase-ios-sdk.git" */;
 			productName = FirebaseCrashlytics;
 		};
 		24D6CFBD2A5C9EAA00D1EFA2 /* Swifter */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = 24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter" */;
+			package = 24D6CFBC2A5C9EAA00D1EFA2 /* XCRemoteSwiftPackageReference "swifter.git" */;
 			productName = Swifter;
 		};
 		24D6CFC02A5E074E00D1EFA2 /* RSFontSizes */ = {
diff --git a/ios-base.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ios-base.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -140,8 +140,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rootstrap/RSFontSizes",
       "state" : {
-        "revision" : "49893271b3a12b7375b8d04477e9c1906fe64e13",
-        "version" : "1.3.1"
+        "branch" : "master",
+        "revision" : "337d42be2e1a2953781954e46192cf036e596547"
       }
     },
     {
diff --git a/ios-base/Onboarding/Views/FirstViewController.swift b/ios-base/Onboarding/Views/FirstViewController.swift
@@ -15,7 +15,8 @@ class FirstViewController: UIViewController,
   // MARK: - Views
   
   private lazy var titleLabel = UILabel.titleLabel(
-    text: "firstscreen_title".localized
+    text: "firstscreen_title".localized,
+    font: .h1Medium
   )
   
   private lazy var facebookSignButton = UIButton.primaryButton(
diff --git a/ios-base/Onboarding/Views/SignInViewController.swift b/ios-base/Onboarding/Views/SignInViewController.swift
@@ -12,7 +12,10 @@ class SignInViewController: UIViewController, ActivityIndicatorPresenter {
   
   // MARK: - Outlets
   
-  private lazy var titleLabel = UILabel.titleLabel(text: "signin_title".localized)
+  private lazy var titleLabel = UILabel.titleLabel(
+    text: "signin_title".localized,
+    font: .h1Medium
+  )
   private lazy var logInButton = UIButton.primaryButton(
     title: "signin_button_title".localized,
     target: self,
diff --git a/ios-base/Onboarding/Views/SignUpViewController.swift b/ios-base/Onboarding/Views/SignUpViewController.swift
@@ -12,7 +12,10 @@ class SignUpViewController: UIViewController, ActivityIndicatorPresenter {
   
   // MARK: - Outlets
   
-  private lazy var titleLabel = UILabel.titleLabel(text: "signup_title".localized)
+  private lazy var titleLabel = UILabel.titleLabel(
+    text: "signup_title".localized,
+    font: .h1Medium
+  )
   private lazy var signUpButton = UIButton.primaryButton(
     title: "signup_button_title".localized,
     target: self,
diff --git a/ios-base/Resources/Localization/Localizable.strings b/ios-base/Resources/Localization/Localizable.strings
@@ -7,7 +7,7 @@
 */
 
 // MARK: FIRST SCREEN
-"firstscreen_title" = "Welcome to \nRS iOS BASE.";
+"firstscreen_title" = "Welcome to \nRootstrap's iOS demo app.";
 "firstscreen_login_button_title" = "LOG IN";
 "firstscreen_facebook_button_title" = "FACEBOOK CONNECT";
 "firstscreen_registre_button_title" = "Don’t have an account? Let’s create one ►";

Original file line number	Diff line number	Diff line change
`@@ -140,8 +140,8 @@`
`140`	`140`	`"kind" : "remoteSourceControl",`
`141`	`141`	`"location" : "https://github.com/rootstrap/RSFontSizes",`
`142`	`142`	`"state" : {`
`143`		`- "revision" : "49893271b3a12b7375b8d04477e9c1906fe64e13",`
`144`		`- "version" : "1.3.1"`
	`143`	`+ "branch" : "master",`
	`144`	`+ "revision" : "337d42be2e1a2953781954e46192cf036e596547"`
`145`	`145`	`}`
`146`	`146`	`},`
`147`	`147`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ class FirstViewController: UIViewController,`
`15`	`15`	`// MARK: - Views`
`16`	`16`
`17`	`17`	`private lazy var titleLabel = UILabel.titleLabel(`
`18`		`- text: "firstscreen_title".localized`
	`18`	`+ text: "firstscreen_title".localized,`
	`19`	`+ font: .h1Medium`
`19`	`20`	`)`
`20`	`21`
`21`	`22`	`private lazy var facebookSignButton = UIButton.primaryButton(`