Merge pull request #1 from sookim-1/fix/ios-repo-path-adjustments

Fix paths, update versions, and adjust documentation for RIBs-iOS repo

Author: alexvbush

Cartfile

@@ -1 +1 @@
-github "ReactiveX/RxSwift" ~> 6.0.0
+github "ReactiveX/RxSwift" ~> 6.5.0

Package.resolved

@@ -10,18 +10,18 @@ let package = Package(
         .library(name: "RIBs", targets: ["RIBs"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/ReactiveX/RxSwift", from: "6.0.0"),
+        .package(url: "https://github.com/ReactiveX/RxSwift", from: "6.5.0"),
     ],
     targets: [
         .target(
             name: "RIBs",
             dependencies: ["RxSwift", "RxRelay"],
-            path: "ios/RIBs"
+            path: "RIBs"
         ),
         .testTarget(
             name: "RIBsTests",
             dependencies: ["RIBs"],
-            path: "ios/RIBsTests"
+            path: "RIBsTests"
         ),
     ]
 )

Package.swift

@@ -6,6 +6,8 @@
 [![Cocoapods Compatible](https://img.shields.io/cocoapods/v/RIBs.svg)](https://cocoapods.org/pods/ribs)
 [![Carthage Compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg)](https://github.com/Carthage/Carthage)
 
+> ⚠️ **Alert:** RIBs for Android [separate repo](https://github.com/uber/ribs)
+
 RIBs is the cross-platform architecture framework behind many mobile apps at Uber. The name RIBs is short for Router, Interactor and Builder, which are core components of this architecture. This framework is designed for mobile apps with a large number of engineers and nested states.
 
 The RIBs architecture provides:

README.md

@@ -1,19 +1,3 @@
-Releasing
-=========
-
-Android
--------
-
- 1. Change the version in `gradle.properties` to a non-SNAPSHOT version.
- 2. Update the `README.md` with the new version.
- 3. Update the `CHANGELOG.md` for the impending release.
- 4. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version)
- 5. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version)
- 6. `./gradlew clean publish --no-daemon --no-parallel && ./gradlew closeAndReleaseRepository`
- 7. Update the `gradle.properties` to the next SNAPSHOT version.
- 8. `git commit -am "Prepare next development version."`
- 9. `git push && git push --tags`
-
 iOS
 ---
 

RELEASING.md

@@ -10,7 +10,7 @@ RIBs is the cross-platform architecture behind many mobile apps at Uber. This ar
   s.author           = { 'uber' => 'mobile-open-source@uber.com' }
   s.source           = { :git => 'https://github.com/uber/RIBs.git', :tag => 'v' + s.version.to_s }
   s.ios.deployment_target = '9.0'
-  s.source_files = 'ios/RIBs/Classes/**/*'
+  s.source_files = 'RIBs/Classes/**/*'
   s.dependency 'RxSwift', '~> 6.5.0'
   s.dependency 'RxRelay', '~> 6.5.0'
 end

RIBs.podspec

@@ -1,20 +1,3 @@
-Releasing
-=========
-
-Android
--------
-
- 1. Change the version in `gradle.properties` to a non-SNAPSHOT version.
- 2. Update the `CHANGELOG.md` for the impending release.
- 3. Update the `README.md` with the new version.
- 4. `git commit -am "Prepare for release X.Y.Z."` (where X.Y.Z is the new version)
- 5. `git tag -a X.Y.Z -m "Version X.Y.Z"` (where X.Y.Z is the new version)
- 6. `./gradlew clean uploadArchives`
- 7. Update the `gradle.properties` to the next SNAPSHOT version.
- 8. `git commit -am "Prepare next development version."`
- 9. `git push && git push --tags`
- 10. Visit [Sonatype Nexus](https://oss.sonatype.org/) and promote the artifact.
-
 iOS
 ---
 

test.md

@@ -7,8 +7,8 @@ target 'TicTacToe' do
   inhibit_all_warnings!
 
   # Pods for TicTacToe
-  pod 'RIBs', :path => '../../../'
+  pod 'RIBs', :path => '../../'
   pod 'SnapKit', '~> 4.0.0'
   pod 'RxCocoa', '~> 6.5'
 
-end
+end

tutorials/tutorial1/Podfile

@@ -19,3 +19,10 @@ pod install
 ```
 
 Then, open the TicTacToe.xcworkspace that was generated by `pod install` and follow the steps described in [tutorial 1](https://github.com/uber/RIBs/wiki/iOS-Tutorial-1) on the RIBs wiki.
+
+**Warning**: If you encounter the following error during build execution:
+
+`SnapKit Pod SDK does not contain 'libarclite' at the path '/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/arc/libarclite_iphoneos.a'; try increasing the minimum deployment target`
+
+-> Please change the Minimum Deployment Target for SnapKit in the Pods project to **9.0** under TARGETS.
+

tutorials/tutorial1/README.md

@@ -4,11 +4,11 @@ use_frameworks!
 inhibit_all_warnings!
 
 target 'TicTacToe' do
-  pod 'RIBs', :path => '../../../'
+  pod 'RIBs', :path => '../../'
   pod 'SnapKit', '~> 4.0.0'
-  pod 'RxCocoa', '~> 5.1'
+  pod 'RxCocoa', '~> 6.5'
 end
 
 target 'TicTacToeTests' do
-    pod 'RIBs', :path => '../../../'
+    pod 'RIBs', :path => '../../'
 end