Merge pull request #2 from ricardopsantos/develop

Version 2.0.0 - RC1
ricardopsantos · Jan 30, 2021 · 71912bc · 71912bc
2 parents 09e8cfb + f501b8c
commit 71912bc
Show file tree

Hide file tree

Showing 99 changed files with 5,704 additions and 1,574 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,5 +9,4 @@ fastlane/*
 .DS_Store
 /.build
 /Packages
-/*.xcodeproj
 xcuserdata/
diff --git a/Documents/Graph.json b/Documents/Graph.json
@@ -1,115 +1,120 @@
 {
   "configs" : {
-    "Release" : "release",
-    "Debug" : "debug"
+    "Debug" : "debug",
+    "Release" : "release"
   },
   "name" : "RJSLibUF",
+  "targetTemplates" : {
+    "Framework" : {
+      "platform" : "iOS",
+      "deploymentTarget" : 13,
+      "settings" : {
+        "base" : {
+          "MARKETING_VERSION" : "1.2.1"
+        }
+      },
+      "type" : "framework"
+    }
+  },
   "options" : {
     "minimumXcodeGenVersion" : "2.18.0",
-    "deploymentTarget" : "11.0",
-    "groupSortPosition" : "top",
     "findCarthageFrameworks" : false,
-    "generateEmptyDirectories" : true,
+    "bundleIdPrefix" : "com.rjps.libuf",
     "xcodeVersion" : "12.0.1",
-    "bundleIdPrefix" : "com.rjps.libuf"
+    "deploymentTarget" : "11.0",
+    "generateEmptyDirectories" : true,
+    "groupSortPosition" : "top"
+  },
+  "settings" : {
+    "base" : {
+      "SWIFT_VERSION" : 5.2999999999999998,
+      "ENABLE_BITCODE" : false,
+      "IPHONEOS_DEPLOYMENT_TARGET" : 13
+    },
+    "configs" : {
+      "Release" : {
+        "ENABLE_BITCODE" : true
+      }
+    }
   },
   "targets" : {
-    "MyLibraryTests" : {
-      "type" : "bundle.unit-test",
-      "scheme" : {
-
-      },
+    "RJSLibUFStorage" : {
+      "templates" : [
+        "Framework"
+      ],
       "dependencies" : [
-        {
-          "link" : false,
-          "target" : "SampleApp"
-        },
         {
           "link" : false,
           "target" : "RJSLibUFBase"
-        },
-        {
-          "target" : "RJSLibUFNetworking",
-          "link" : false
-        },
-        {
-          "link" : false,
-          "target" : "RJSLibUFALayouts"
-        },
-        {
-          "target" : "RJSLibUFStorage",
-          "link" : false
         }
       ],
       "sources" : [
         {
-          "path" : "..\/Tests\/RJSLibUFTests"
+          "path" : "..\/Sources\/RJSLibUFStorage"
         }
-      ],
-      "platform" : "iOS"
+      ]
     },
-    "RJSLibUFALayouts" : {
+    "RJSLibUFAppThemes" : {
       "dependencies" : [
         {
-          "target" : "RJSLibUFBase",
-          "link" : false
+          "link" : false,
+          "target" : "RJSLibUFBase"
         }
       ],
+      "templates" : [
+        "Framework"
+      ],
       "sources" : [
         {
-          "path" : "..\/Sources\/RJSLibUFALayouts"
+          "path" : "..\/Sources\/RJSLibUFAppThemes"
         }
-      ],
-      "templates" : [
-        "Framework"
       ]
     },
-    "RJSLibUFAppThemes" : {
-      "dependencies" : [
-        {
-          "target" : "RJSLibUFBase",
-          "link" : false
-        }
-      ],
+    "RJSLibUFNetworking" : {
       "sources" : [
         {
-          "path" : "..\/Sources\/RJSLibUFAppThemes"
+          "path" : "..\/Sources\/RJSLibUFNetworking"
         }
       ],
       "templates" : [
         "Framework"
+      ],
+      "dependencies" : [
+        {
+          "link" : false,
+          "target" : "RJSLibUFBase"
+        }
       ]
     },
-    "RJSLibUFStorage" : {
+    "RJSLibUFALayouts" : {
       "templates" : [
         "Framework"
       ],
       "sources" : [
         {
-          "path" : "..\/Sources\/RJSLibUFStorage"
+          "path" : "..\/Sources\/RJSLibUFALayouts"
         }
       ],
       "dependencies" : [
         {
-          "link" : false,
-          "target" : "RJSLibUFBase"
+          "target" : "RJSLibUFBase",
+          "link" : false
         }
       ]
     },
     "SampleApp" : {
-      "sources" : [
-        {
-          "path" : "..\/SampleApp"
-        }
-      ],
+      "type" : "application",
       "postCompileScripts" : [
         {
           "name" : "Run SwiftLint",
           "script" : "if which swiftlint >\/dev\/null; then\n   swiftlint\nelse\n   echo \"warning: SwiftLint not installed, download from https:\/\/github.com\/realm\/SwiftLint\"\nfi\n"
         }
       ],
-      "type" : "application",
-      "platform" : "iOS",
+      "sources" : [
+        {
+          "path" : "..\/SampleApp"
+        }
+      ],
       "dependencies" : [
         {
           "target" : "RJSLibUFBase",
@@ -120,74 +125,69 @@
           "target" : "RJSLibUFAppThemes"
         },
         {
-          "link" : true,
-          "target" : "RJSLibUFNetworking"
+          "target" : "RJSLibUFNetworking",
+          "link" : true
         },
         {
-          "link" : true,
-          "target" : "RJSLibUFALayouts"
+          "target" : "RJSLibUFALayouts",
+          "link" : true
         },
         {
           "link" : true,
           "target" : "RJSLibUFStorage"
         }
       ],
+      "deploymentTarget" : 13,
+      "platform" : "iOS",
       "settings" : {
         "base" : {
           "MARKETING_VERSION" : 1
         }
-      },
-      "deploymentTarget" : 13
+      }
     },
     "RJSLibUFBase" : {
-      "templates" : [
-        "Framework"
-      ],
       "sources" : [
         {
           "path" : "..\/Sources\/RJSLibUFBase"
         }
+      ],
+      "templates" : [
+        "Framework"
       ]
     },
-    "RJSLibUFNetworking" : {
+    "MyLibraryTests" : {
+      "type" : "bundle.unit-test",
+      "platform" : "iOS",
+      "sources" : [
+        {
+          "path" : "..\/Tests\/RJSLibUFTests"
+        }
+      ],
+      "scheme" : {
+
+      },
       "dependencies" : [
+        {
+          "link" : false,
+          "target" : "SampleApp"
+        },
         {
           "link" : false,
           "target" : "RJSLibUFBase"
-        }
-      ],
-      "sources" : [
+        },
         {
-          "path" : "..\/Sources\/RJSLibUFNetworking"
+          "link" : false,
+          "target" : "RJSLibUFNetworking"
+        },
+        {
+          "target" : "RJSLibUFALayouts",
+          "link" : false
+        },
+        {
+          "target" : "RJSLibUFStorage",
+          "link" : false
         }
-      ],
-      "templates" : [
-        "Framework"
       ]
     }
-  },
-  "settings" : {
-    "base" : {
-      "SWIFT_VERSION" : 5.2999999999999998,
-      "ENABLE_BITCODE" : false,
-      "IPHONEOS_DEPLOYMENT_TARGET" : 13
-    },
-    "configs" : {
-      "Release" : {
-        "ENABLE_BITCODE" : true
-      }
-    }
-  },
-  "targetTemplates" : {
-    "Framework" : {
-      "deploymentTarget" : 13,
-      "settings" : {
-        "base" : {
-          "MARKETING_VERSION" : "1.2.1"
-        }
-      },
-      "platform" : "iOS",
-      "type" : "framework"
-    }
   }
 }
diff --git a/Package.swift b/Package.swift
@@ -32,9 +32,9 @@ let spmNetworkingTargetName = "RJSLibUFNetworking"
 let spmNetworkingDependency = dependencyWith(name: spmNetworkingTargetName)
 
 let spmStorageTargetName = "RJSLibUFStorage"
-let spmTStorageDependency = dependencyWith(name: spmStorageTargetName)
+let spmStorageDependency = dependencyWith(name: spmStorageTargetName)
 
-let testTargetDependencies = [spmALayoutsDependency, spmThemesDependency, spmNetworkingDependency, spmTStorageDependency]
+let testTargetDependencies = [spmALayoutsDependency, spmThemesDependency, spmNetworkingDependency, spmStorageDependency]
 let plistFile = "Info.plist"
 
 let swiftSettings:[SwiftSetting] = [
@@ -50,14 +50,14 @@ let package = Package(
     products: [
         libraryWith(name: spmBaseTargetName),
         libraryWith(name: spmALayoutsTargetName),
-        libraryWith(name: spmThemesTargetName),
         libraryWith(name: spmNetworkingTargetName),
+        libraryWith(name: spmThemesTargetName),
         libraryWith(name: spmStorageTargetName)
     ],
     targets: [
         .target(name: spmBaseTargetName, exclude: [plistFile]),
-        .target(name: spmALayoutsTargetName, exclude: [plistFile]),
-        .target(name: spmThemesTargetName, exclude: [plistFile]),
+        .target(name: spmALayoutsTargetName, dependencies: [spmBaseDependency], exclude: [plistFile]),
+        .target(name: spmThemesTargetName, dependencies: [spmBaseDependency], exclude: [plistFile]),
         .target(name: spmNetworkingTargetName, dependencies: [spmBaseDependency], exclude: [plistFile]),
         .target(name: spmStorageTargetName, dependencies: [spmBaseDependency], exclude: [plistFile], resources: [.process("RJPSLibDataModel.xcdatamodel")]),
         .testTarget(name: "RJSLibUFTests", dependencies: testTargetDependencies),

diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ _To do..._
 
 ---
 
-### RJSLibUFALayouts
+### RJSLibUFALayouts (deprecated)
 
 Auto-layout framework (supports constraints or anchors)