diff --git a/.github/workflows/Danger.yml b/.github/workflows/Danger.yml index 4b0afcd..ee21487 100644 --- a/.github/workflows/Danger.yml +++ b/.github/workflows/Danger.yml @@ -1,68 +1,43 @@ name: Danger on: - - pull_request - - workflow_dispatch + pull_request: + push: + branches: + - master + +permissions: + pull-requests: write jobs: danger: - - runs-on: macos-11 - + runs-on: macos-13 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - name: Setup ruby - uses: actions/setup-ruby@v1 + uses: ruby/setup-ruby@v1 with: - ruby-version: '2.6' - - - name: Select Xcode - run: sudo xcode-select -s /Applications/Xcode_13.2.1.app - - - name: Cache RubyGems - uses: actions/cache@v1 + ruby-version: '3.2' + bundler-cache: true + - name: Cache Mint + uses: actions/cache@v3 with: - path: vendor/bundle - key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }} + path: .mint + key: ${{ runner.os }}-mint-${{ env.SWIFTLINT_VERSION }} restore-keys: | - ${{ runner.os }}-gem- - - - name: Cache Mint Builds - uses: actions/cache@v1 - with: - path: ${{ env.MINT_PATH }} - key: ${{ runner.os }}-mint-build-${{ env.SWIFTLINT_VERSION }} - restore-keys: | - ${{ runner.os }}-mint-build- - - - name: Cache Mint Links - uses: actions/cache@v1 - with: - path: ${{ env.MINT_LINK_PATH }} - key: ${{ runner.os }}-mint-link-${{ env.SWIFTLINT_VERSION }} - restore-keys: | - ${{ runner.os }}-mint-link- - - - name: Bundle install - run: | - gem install bundler - bundle config path vendor/bundle - bundle install --jobs 4 --retry 3 - + ${{ runner.os }}-mint- - name: Install Mint and Packages run: | brew install mint mint install realm/SwiftLint@${{ env.SWIFTLINT_VERSION }} - - name: Run Danger run: bundle exec danger env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - env: - MINT_PATH: ${{ github.workspace }}/mint - MINT_LINK_PATH: ${{ github.workspace }}/mint/bin - SWIFTLINT_VERSION: 0.39.1 + MINT_PATH: .mint/lib + MINT_LINK_PATH: .mint/bin + SWIFTLINT_VERSION: 0.53.0 + DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer diff --git a/.github/workflows/Swift-Build.yml b/.github/workflows/Swift-Build.yml index cd0b3f7..14c5934 100644 --- a/.github/workflows/Swift-Build.yml +++ b/.github/workflows/Swift-Build.yml @@ -5,14 +5,14 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-10.15, macos-11] - xcode: [12.4, 13.2.1] + os: [macos-12, macos-13] + xcode: ['14.2', '15.0'] exclude: - - os: macos-10.15 - xcode: 13.2.1 + - os: macos-12 + xcode: '15.0' env: DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build and Test run: swift test diff --git a/.github/workflows/Xcode-Build.yml b/.github/workflows/Xcode-Build.yml index fc7be3f..139d276 100644 --- a/.github/workflows/Xcode-Build.yml +++ b/.github/workflows/Xcode-Build.yml @@ -5,15 +5,15 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [macos-10.15, macos-11] - xcode: [12.4, 13.2.1] + os: [macos-12, macos-13] + xcode: ['14.2', '15.0'] exclude: - - os: macos-10.15 - xcode: 13.2.1 + - os: macos-12 + xcode: '15.0' env: DEVELOPER_DIR: "/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Build and Test run: | set -o pipefail @@ -21,11 +21,9 @@ jobs: -workspace "$PROJECT" \ -scheme "$SCHEME" \ -sdk "$SDK" \ - -destination "$DESTINATION" \ -configuration Debug \ ENABLE_TESTABILITY=YES | xcpretty -c; env: PROJECT: Sauce.xcworkspace SCHEME: Sauce SDK: macosx - DESTINATION: arch=x86_64 diff --git a/Dangerfile b/Dangerfile index cf6f963..7371937 100644 --- a/Dangerfile +++ b/Dangerfile @@ -1,4 +1,4 @@ github.dismiss_out_of_range_messages swiftlint.config_file = '.swiftlint.yml' -swiftlint.binary_path = './mint/bin/swiftlint' +swiftlint.binary_path = '.mint/bin/swiftlint' swiftlint.lint_files(inline_mode: true) diff --git a/Gemfile.lock b/Gemfile.lock index 290fd9f..6dd4806 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: CFPropertyList (3.0.5) rexml - activesupport (6.1.4.4) + activesupport (6.1.7.6) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 1.6, < 2) minitest (>= 5.1) @@ -49,7 +49,7 @@ GEM public_suffix (~> 4.0) typhoeus (~> 1.0) cocoapods-deintegrate (1.0.5) - cocoapods-downloader (1.5.1) + cocoapods-downloader (1.6.3) cocoapods-plugins (1.0.0) nap cocoapods-search (1.0.1) @@ -58,7 +58,7 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.9) + concurrent-ruby (1.2.2) cork (0.3.0) colored2 (~> 3.1) danger (8.4.2) @@ -110,17 +110,18 @@ GEM fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - git (1.11.0) + git (1.18.0) + addressable (~> 2.8) rchardet (~> 1.8) httpclient (2.8.3) - i18n (1.9.1) + i18n (1.14.1) concurrent-ruby (~> 1.0) json (2.6.1) kramdown (2.3.1) rexml kramdown-parser-gfm (1.1.0) kramdown (~> 2.0) - minitest (5.15.0) + minitest (5.20.0) molinillo (0.8.0) multipart-post (2.1.1) nanaimo (0.3.0) @@ -145,7 +146,7 @@ GEM thor (0.20.3) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (2.0.4) + tzinfo (2.0.6) concurrent-ruby (~> 1.0) unicode-display_width (2.1.0) xcodeproj (1.21.0) @@ -155,7 +156,7 @@ GEM colored2 (~> 3.1) nanaimo (~> 0.3.0) rexml (~> 3.2.4) - zeitwerk (2.5.4) + zeitwerk (2.6.12) PLATFORMS ruby diff --git a/Lib/Sauce.xcodeproj/project.pbxproj b/Lib/Sauce.xcodeproj/project.pbxproj index 89dc646..84224f7 100644 --- a/Lib/Sauce.xcodeproj/project.pbxproj +++ b/Lib/Sauce.xcodeproj/project.pbxproj @@ -394,8 +394,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.4.0; PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.Sauce"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; @@ -423,8 +422,7 @@ "@executable_path/../Frameworks", "@loader_path/Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 10.10; - MARKETING_VERSION = 2.3.0; + MARKETING_VERSION = 2.4.0; PRODUCT_BUNDLE_IDENTIFIER = "com.clipy-app.Sauce"; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; diff --git a/Package.swift b/Package.swift index fe0c6fe..c0c2856 100644 --- a/Package.swift +++ b/Package.swift @@ -5,7 +5,7 @@ import PackageDescription let package = Package( name: "Sauce", platforms: [ - .macOS(.v10_10) + .macOS(.v10_13) ], products: [ .library( diff --git a/Sauce.podspec b/Sauce.podspec index 4336b1e..ee40bf4 100644 --- a/Sauce.podspec +++ b/Sauce.podspec @@ -1,12 +1,12 @@ Pod::Spec.new do |s| s.name = "Sauce" - s.version = "2.3.0" + s.version = "2.4.0" s.summary = "Mapping various keyboard layout sources and key codes in macOS. (e.g.: QWERTY, Dvorak)" s.license = { :type => 'MIT', :file => 'LICENSE' } s.homepage = "https://github.com/Clipy/Sauce" s.author = { "Econa77" => "s.f.1992.ip@gmail.com" } s.source = { :git => "https://github.com/Clipy/Sauce.git", :tag => "v#{s.version}" } - s.platform = :osx, '10.10' + s.platform = :osx, '10.13' s.source_files = 'Lib/Sauce/**/*.swift' s.swift_version = '5.0' s.frameworks = 'Carbon', 'Cocoa'