add objc support

StefaniOSApps · Jun 28, 2020 · b58ea01 · b58ea01
1 parent f3bbe34
commit b58ea01
Show file tree

Hide file tree

Showing 28 changed files with 720 additions and 34 deletions.
diff --git a/BIASystemKit.podspec b/BIASystemKit.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name = 'BIASystemKit'
-  s.version = '0.1.1'
+  s.version = '1.0'
   s.license = 'MIT'
   s.summary = 'iOS SystemKit Framework (best-ios-apps.de)'
   s.homepage = 'https://www.best-ios-apps.de'

diff --git a/Example/Info.plist → ...deproj/BIASystemKitExampleObjC_Info.plist b/Example/Info.plist → ...deproj/BIASystemKitExampleObjC_Info.plist
diff --git a/BIASystemKit.xcodeproj/BIASystemKitExampleSwift_Info.plist b/BIASystemKit.xcodeproj/BIASystemKitExampleSwift_Info.plist
@@ -0,0 +1,44 @@
+<?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>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</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>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UILaunchStoryboardName</key>
+	<string>LaunchScreen</string>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+</dict>
+</plist>
diff --git a/BIASystemKit.xcodeproj/project.pbxproj b/BIASystemKit.xcodeproj/project.pbxproj
diff --git a/BIASystemKit.xcodeproj/xcshareddata/xcschemes/BIASystemKit.xcscheme b/BIASystemKit.xcodeproj/xcshareddata/xcschemes/BIASystemKit.xcscheme
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1150"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "369E579C2496C10900253C90"
+               BuildableName = "BIASystemKit.framework"
+               BlueprintName = "BIASystemKit"
+               ReferencedContainer = "container:BIASystemKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "36A02A5F2496CE2A00DBDEB6"
+               BuildableName = "BIASystemKitTests.xctest"
+               BlueprintName = "BIASystemKitTests"
+               ReferencedContainer = "container:BIASystemKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "369E579C2496C10900253C90"
+            BuildableName = "BIASystemKit.framework"
+            BlueprintName = "BIASystemKit"
+            ReferencedContainer = "container:BIASystemKit.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/BIASystemKit.xcodeproj/xcshareddata/xcschemes/Example ObjC.xcscheme b/BIASystemKit.xcodeproj/xcshareddata/xcschemes/Example ObjC.xcscheme
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1150"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "368281C124A90D4100C196D6"
+               BuildableName = "Example ObjC.app"
+               BlueprintName = "Example ObjC"
+               ReferencedContainer = "container:BIASystemKit.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "36A02A5F2496CE2A00DBDEB6"
+               BuildableName = "BIASystemKitTests.xctest"
+               BlueprintName = "BIASystemKitTests"
+               ReferencedContainer = "container:BIASystemKit.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "368281C124A90D4100C196D6"
+            BuildableName = "Example ObjC.app"
+            BlueprintName = "Example ObjC"
+            ReferencedContainer = "container:BIASystemKit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "368281C124A90D4100C196D6"
+            BuildableName = "Example ObjC.app"
+            BlueprintName = "Example ObjC"
+            ReferencedContainer = "container:BIASystemKit.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/...j/xcshareddata/xcschemes/Example.xcscheme → ...areddata/xcschemes/Example Swift.xcscheme b/...j/xcshareddata/xcschemes/Example.xcscheme → ...areddata/xcschemes/Example Swift.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "369E57AB2496C11B00253C90"
-               BuildableName = "Example.app"
-               BlueprintName = "Example"
+               BuildableName = "Example Swift.app"
+               BlueprintName = "Example Swift"
                ReferencedContainer = "container:BIASystemKit.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -45,8 +45,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "369E57AB2496C11B00253C90"
-            BuildableName = "Example.app"
-            BlueprintName = "Example"
+            BuildableName = "Example Swift.app"
+            BlueprintName = "Example Swift"
             ReferencedContainer = "container:BIASystemKit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
@@ -62,8 +62,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "369E57AB2496C11B00253C90"
-            BuildableName = "Example.app"
-            BlueprintName = "Example"
+            BuildableName = "Example Swift.app"
+            BlueprintName = "Example Swift"
             ReferencedContainer = "container:BIASystemKit.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>

diff --git a/BIASystemKit.xcodeproj/xcuserdata/stefannebel.xcuserdatad/xcschemes/xcschememanagement.plist b/BIASystemKit.xcodeproj/xcuserdata/stefannebel.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -5,11 +5,16 @@
 	<key>SchemeUserState</key>
 	<dict>
 		<key>BIASystemKit.xcscheme_^#shared#^_</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>2</integer>
+		</dict>
+		<key>Example ObjC.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>1</integer>
 		</dict>
-		<key>Example.xcscheme_^#shared#^_</key>
+		<key>Example Swift.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
 			<integer>0</integer>
@@ -22,11 +27,26 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>368281C124A90D4100C196D6</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>369E579C2496C10900253C90</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>369E57AB2496C11B00253C90</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>36A02A5F2496CE2A00DBDEB6</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>
diff --git a/BIASystemKit/UIDevice/DeviceHelper.swift b/BIASystemKit/UIDevice/DeviceHelper.swift
@@ -34,7 +34,7 @@ private extension DeviceHelper {
   static let simulatorList = devices(filename: "device-map-simulator")
 
   private static func devices(filename: String) -> [DeviceMap] {
-    guard let url = Bundle(for: DeviceHelper.self).url(forResource: filename, withExtension: "json") else { return [] }
+    guard let url = Bundle(for: self).url(forResource: filename, withExtension: "json") else { return [] }
 
     do {
       let data = try Data(contentsOf: url)

diff --git a/BIASystemKit/UIDevice/UIDevice.swift b/BIASystemKit/UIDevice/UIDevice.swift
@@ -5,8 +5,10 @@
 
 import UIKit
 
+
 public extension UIDevice {
 
+  @objc
   var formattedName: String {
     return DeviceHelper(modelName: modelName).formattedName
   }

diff --git a/Example/ObjC/AppDelegate.h b/Example/ObjC/AppDelegate.h
@@ -0,0 +1,11 @@
+//
+//  Created by Stefan Nebel on 28.06.20.
+//  Copyright © 2020 Best-iOS-Apps. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+@property (strong, nonatomic) UIWindow *window;
+@end
+
diff --git a/Example/ObjC/AppDelegate.m b/Example/ObjC/AppDelegate.m
@@ -0,0 +1,26 @@
+//
+//  Created by Stefan Nebel on 28.06.20.
+//  Copyright © 2020 Best-iOS-Apps. All rights reserved.
+//
+
+#import "AppDelegate.h"
+#import "ExampleViewModel.h"
+#import "ExampleViewController.h"
+
+@interface AppDelegate ()
+@end
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+
+  ExampleViewModel *viewModel = [[ExampleViewModel alloc] init];
+  ExampleViewController *viewController = [[ExampleViewController alloc] initWithModel:viewModel];
+  self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
+  [self.window setRootViewController:viewController];
+  [self.window makeKeyAndVisible];
+
+  return YES;
+}
+
+@end
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/Example/Assets.xcassets/Contents.json → Example/ObjC/Assets.xcassets/Contents.json b/Example/Assets.xcassets/Contents.json → Example/ObjC/Assets.xcassets/Contents.json
diff --git a/Example/Base.lproj/LaunchScreen.storyboard → ...e/ObjC/Base.lproj/LaunchScreen.storyboard b/Example/Base.lproj/LaunchScreen.storyboard → ...e/ObjC/Base.lproj/LaunchScreen.storyboard
diff --git a/Example/ObjC/ExampleViewController.h b/Example/ObjC/ExampleViewController.h
@@ -0,0 +1,16 @@
+//
+//  Created by Stefan Nebel on 28.06.20.
+//  Copyright © 2020 Best-iOS-Apps. All rights reserved.
+//
+
+@import UIKit;
+#import "ExampleViewModel.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface ExampleViewController : UIViewController
+- (nonnull instancetype)initWithModel:(ExampleViewModel *)viewModel;
+@end
+
+NS_ASSUME_NONNULL_END
+