Merge pull request #27 from luoxiu/refactor-project-structure

[big pr]: refactor project structure

Author: CoderMJLee

.travis.yml

@@ -0,0 +1,47 @@
+env:
+  global: 
+    - PROJECT="KakaJSON.xcodeproj"
+    - SCHEME="KakaJSON-Package"
+    - SWIFT_VERSION=5.0
+
+matrix:
+  include:
+    - os: osx
+      language: swift
+      osx_image: xcode10.2
+      env:
+        - SDK="iphonesimulator12.2"
+        - DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=12.2"
+    - os: osx
+      language: swift
+      osx_image: xcode10.2
+      env:
+        - SDK="macosx10.14"
+        - DESTINATION="arch=x86_64"
+    - os: osx
+      language: swift
+      osx_image: xcode10.2
+      env:
+        - SDK="appletvsimulator12.0"
+        - DESTINATION="OS=12.0,name=Apple TV 4K"
+    # - os: linux
+    #   language: generic
+    #   dist: trusty
+    #   sudo: required
+
+before_install:
+  - echo $TRAVIS_OS_NAME
+  - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      gem install xcpretty;
+    fi
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+      eval "$(curl -sL https://swiftenv.fuller.li/install.sh)";
+    fi
+
+script:
+  - if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
+      xcodebuild clean build test -project "$PROJECT" -scheme "$SCHEME" -sdk "$SDK" -destination "$DESTINATION" -enableCodeCoverage YES | xcpretty;
+    fi
+  - if [[ $TRAVIS_OS_NAME == 'linux' ]]; then
+      swift test;
+    fi

KakaJSON/DevGuidline.h renamed to DevGuideline.md

@@ -1,5 +1,5 @@
 //
-//  DevGuidline.h
+//  DevGuideline.md
 //  KakaJSON
 //
 //  Created by MJ Lee on 2019/8/14.
@@ -54,6 +54,6 @@
 - obj._memberName
 - e.g. "123"._numberCount, model._JSON()
 
-④ Name of method or tpye must be `JSON`
+④ Name of method or type must be `JSON`
 - not `json`, not `Json`
 - name of variable can be `json`

KakaJSON.podspec

@@ -15,5 +15,5 @@ Pod::Spec.new do |s|
   s.tvos.deployment_target = "9.0"
 
   s.source   = { :git => "https://github.com/kakaopensource/KakaJSON.git", :tag => s.version }
-  s.source_files = "KakaJSON/**/*.swift"
+  s.source_files = "Sources/KakaJSON/**/*.swift"
 end

KakaJSON.xcodeproj/KakaJSONTests_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>BNDL</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

KakaJSON.xcodeproj/KakaJSON_Info.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<plist version="1.0">
+<dict>
+  <key>CFBundleDevelopmentRegion</key>
+  <string>en</string>
+  <key>CFBundleExecutable</key>
+  <string>$(EXECUTABLE_NAME)</string>
+  <key>CFBundleIdentifier</key>
+  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <key>CFBundleInfoDictionaryVersion</key>
+  <string>6.0</string>
+  <key>CFBundleName</key>
+  <string>$(PRODUCT_NAME)</string>
+  <key>CFBundlePackageType</key>
+  <string>FMWK</string>
+  <key>CFBundleShortVersionString</key>
+  <string>1.0</string>
+  <key>CFBundleSignature</key>
+  <string>????</string>
+  <key>CFBundleVersion</key>
+  <string>$(CURRENT_PROJECT_VERSION)</string>
+  <key>NSPrincipalClass</key>
+  <string></string>
+</dict>
+</plist>

KakaJSON.xcodeproj/project.pbxproj

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded</key>
+    <false/>
+</dict>
+</plist>

KakaJSONDemo.xcodeproj/project.xcworkspace/contents.xcworkspacedata renamed to KakaJSON.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1030"
+   LastUpgradeVersion = "9999"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -14,10 +14,10 @@
             buildForAnalyzing = "YES">
             <BuildableReference
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "2D906833230F7B2A00243BB6"
+               BlueprintIdentifier = "KakaJSON::KakaJSON"
                BuildableName = "KakaJSON.framework"
                BlueprintName = "KakaJSON"
-               ReferencedContainer = "container:KakaJSONDemo.xcodeproj">
+               ReferencedContainer = "container:KakaJSON.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
@@ -28,6 +28,16 @@
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "KakaJSON::KakaJSONTests"
+               BuildableName = "KakaJSONTests.xctest"
+               BlueprintName = "KakaJSONTests"
+               ReferencedContainer = "container:KakaJSON.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
       </Testables>
       <AdditionalOptions>
       </AdditionalOptions>
@@ -45,10 +55,10 @@
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2D906833230F7B2A00243BB6"
+            BlueprintIdentifier = "KakaJSON::KakaJSON"
             BuildableName = "KakaJSON.framework"
             BlueprintName = "KakaJSON"
-            ReferencedContainer = "container:KakaJSONDemo.xcodeproj">
+            ReferencedContainer = "container:KakaJSON.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
@@ -60,15 +70,6 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "2D906833230F7B2A00243BB6"
-            BuildableName = "KakaJSON.framework"
-            BlueprintName = "KakaJSON"
-            ReferencedContainer = "container:KakaJSONDemo.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">