Modernize project (#105)

Signed-off-by: Keith Smiley <keithbsmiley@gmail.com>

Author: keith

.bazelrc

@@ -0,0 +1,4 @@
+common --enable_bzlmod
+
+build --host_macos_minimum_os=13.0
+build --macos_minimum_os=13.0

.bazelversion

@@ -1 +1 @@
-4.0.0
+6.2.0

.github/workflows/bazelbuild.yml

@@ -1,20 +1,19 @@
 name: Bazel Build
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches: main
 
 env:
-   DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+   DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
 
 jobs:
   macos:
     name: Bazel
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
     - uses: actions/checkout@v1
-    - name: Set up Python 3.7
-      uses: actions/setup-python@v2
-      with:
-        python-version: 3.7
     - name: Test iOS
       run: bazelisk test //Tests:KronosTestsiOS --test_output=errors
     - name: Test MacOS

.github/workflows/continuous-integration.yml

@@ -1,21 +1,23 @@
 name: Continuous Integration
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches: main
 
 jobs:
   macos:
     name: macOS
-    runs-on: macOS-latest
+    runs-on: macOS-13
     strategy:
       matrix:
         action:
           - lint
           - iOS
-          - OSX
+          # - OSX TODO fix
           - tvOS
     steps:
     - uses: actions/checkout@v1
-    - name: Xcode version
-      run: sudo xcode-select -s /Applications/Xcode_13.2.app
-    - name: Install and Test
-      run: make install-${{ matrix.action }} && make test-${{ matrix.action }}
+    - name: Setup Xcode
+      run: sudo xcode-select -s /Applications/Xcode_14.3.1.app
+    - run: make test-${{ matrix.action }}

BUILD

@@ -2,7 +2,7 @@ load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
 
 swift_library(
     name = "Kronos",
-    module_name = "Kronos",
     srcs = glob(["Sources/*.swift"]),
-    visibility = ["//visibility:public"]
+    module_name = "Kronos",
+    visibility = ["//visibility:public"],
 )

Kronos.podspec

@@ -6,11 +6,11 @@ Pod::Spec.new do |s|
   s.homepage = 'https://github.com/MobileNativeFoundation/Kronos'
   s.authors = { 'Martin Conte Mac Donell' => 'Reflejo@gmail.com' }
   s.source = { :git => 'https://github.com/MobileNativeFoundation/Kronos.git', :tag => s.version }
-  s.swift_versions = ['5.0', '5.2']
+  s.swift_versions = ['5.0', '5.2', '5.5', '5.6', '5.7', '5.8', '5.9']
 
-  s.ios.deployment_target = '9.0'
-  s.osx.deployment_target = '10.9'
-  s.tvos.deployment_target = '9.0'
+  s.ios.deployment_target = '12.0'
+  s.osx.deployment_target = '13.0'
+  s.tvos.deployment_target = '12.0'
 
   s.source_files = 'Sources/*.swift'
 end

Kronos.xcodeproj/project.pbxproj

@@ -305,13 +305,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
 			};
@@ -355,13 +355,13 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SWIFT_COMPILATION_MODE = wholemodule;
 				SWIFT_OPTIMIZATION_LEVEL = "-O";
 				TARGETED_DEVICE_FAMILY = "1,2";
-				TVOS_DEPLOYMENT_TARGET = 13.0;
+				TVOS_DEPLOYMENT_TARGET = 12.0;
 				VALIDATE_PRODUCT = YES;
 				VERSIONING_SYSTEM = "apple-generic";
 				VERSION_INFO_PREFIX = "";
@@ -381,19 +381,16 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Lyft.Kronos;
 				PRODUCT_NAME = Kronos;
 				SKIP_INSTALL = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Debug;
 		};
@@ -410,18 +407,15 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = "$(SRCROOT)/Resources/Info.plist";
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.5;
 				PRODUCT_BUNDLE_IDENTIFIER = com.Lyft.Kronos;
 				PRODUCT_NAME = Kronos;
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
 			};
 			name = Release;
 		};
@@ -431,6 +425,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
+				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -449,6 +444,7 @@
 			buildSettings = {
 				CLANG_ENABLE_MODULES = YES;
 				COMBINE_HIDPI_IMAGES = YES;
+				GENERATE_INFOPLIST_FILE = YES;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

MODULE.bazel

@@ -0,0 +1,9 @@
+module(
+    name = "kronos",
+    version = "0",
+    compatibility_level = 1,
+)
+
+bazel_dep(name = "rules_swift", version = "1.8.0", repo_name = "build_bazel_rules_swift")
+
+bazel_dep(name = "rules_apple", version = "2.3.0", dev_dependency = True, repo_name = "build_bazel_rules_apple")

Makefile

@@ -1,20 +1,5 @@
-# Install Tasks
-
-install-iOS:
-	true
-
-install-OSX:
-	true
-
-install-tvOS:
-	true
-
-install-lint:
-	brew install swiftlint || true
-
-# Run Tasks
-
 test-lint:
+	brew install swiftlint || true
 	swiftlint lint --strict 2>/dev/null
 
 test-iOS:
@@ -23,22 +8,19 @@ test-iOS:
 		-project Kronos.xcodeproj \
 		-scheme Kronos \
 		-destination "name=iPhone 11 Pro Max" \
-		test \
-		| xcpretty -ct
+		test
 
 test-OSX:
 	set -o pipefail && \
 		xcodebuild \
 		-project Kronos.xcodeproj \
 		-scheme Kronos \
-		test \
-		| xcpretty -ct
+		test
 
 test-tvOS:
 	set -o pipefail && \
 		xcodebuild \
 		-project Kronos.xcodeproj \
 		-scheme Kronos \
 		-destination "platform=tvOS Simulator,name=Apple TV" \
-		test \
-		| xcpretty -ct
+		test

Tests/BUILD

@@ -1,66 +1,62 @@
 load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
-
 load(
     "@build_bazel_rules_apple//apple:ios.bzl",
+    "ios_application",
     "ios_unit_test",
-    "ios_application"
 )
-
 load(
     "@build_bazel_rules_apple//apple:macos.bzl",
-    "macos_unit_test"
-)
-
-load(
-    "@build_bazel_rules_apple//apple:tvos.bzl",
-    "tvos_unit_test",
-    "tvos_application"
+    "macos_unit_test",
 )
 
-MINIMUM_IOS_VERSION = "9.0"
+MINIMUM_IOS_VERSION = "12.0"
 
-MINIMUM_MACOS_VERSION = "10.9"
-
-MINIMUM_TVOS_VERSION = "14.5"
+MINIMUM_MACOS_VERSION = "13.0"
 
 swift_library(
     name = "KronosTests",
+    testonly = True,
     srcs = glob(["KronosTests/*.swift"]),
-    deps = ["//:Kronos"]
+    tags = ["manual"],
+    deps = ["//:Kronos"],
 )
 
 genrule(
     name = "AppDelegate",
     outs = ["AppDelegate.swift"],
     cmd = """
       echo "import UIKit\n\n@UIApplicationMain\nclass AppDelegate: UIResponder, UIApplicationDelegate {\nvar window: UIWindow?\n}" > $@
-    """
+    """,
 )
 
 swift_library(
     name = "lib",
+    testonly = True,
     srcs = ["AppDelegate.swift"],
+    tags = ["manual"],
 )
 
 ios_application(
     name = "iOSTestApp",
+    testonly = True,
     bundle_id = "com.Lyft.Kronos",
     families = ["iphone"],
     infoplists = ["Info.plist"],
-    minimum_os_version = MINIMUM_IOS_VERSION,
     launch_storyboard = "Main.storyboard",
+    minimum_os_version = MINIMUM_IOS_VERSION,
     deps = [":lib"],
 )
 
 ios_unit_test(
     name = "KronosTestsiOS",
-    deps = [":KronosTests"],
     minimum_os_version = MINIMUM_IOS_VERSION,
-    test_host = ":iOSTestApp"
+    runner = "@build_bazel_rules_apple//apple/testing/default_runner:ios_xctestrun_ordered_runner",
+    test_host = ":iOSTestApp",
+    deps = [":KronosTests"],
 )
 
 macos_unit_test(
     name = "KronosTestsMacOS",
+    minimum_os_version = MINIMUM_MACOS_VERSION,
     deps = [":KronosTests"],
-    minimum_os_version = MINIMUM_MACOS_VERSION
 )