Merge pull request #1819 from Catrobat/release-0.6.21

Release 0.6.21

.github/workflows/scheduled-upload-crowdin.yml

@@ -5,14 +5,19 @@ on:
     - cron:  '0 0 * * *'
 
 jobs:
-  build:
+  CrowdinUpload:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
       with:
-          ref: develop
-    - name: Upload Localization to Crowdin by fastlane
+        ref: develop
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        working-directory: src
+        bundler-cache: true
+    - name: Upload Localizations to Crowdin via Fastlane
       env:
         CROWDIN_KEY: ${{ secrets.CROWDIN_API }}
-        FASTLANE_SKIP_UPDATE_CHECK: '1'
-      run: cd src && fastlane crowdin_upload
+      run: cd src && bundle exec fastlane ios crowdin_upload

.github/workflows/swiftlint.yml

@@ -9,8 +9,9 @@ jobs:
   SwiftLint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
-      - name: GitHub Action for SwiftLint
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Lint with SwiftLint
         uses: norio-nomura/[email protected]
         with:
           args: --config .swiftlint.yml --strict

.gitignore

@@ -40,12 +40,6 @@ playground.xcworkspace
 # Package.resolved
 .build/
 
-# Carthage
-#
-# Add this line if you want to avoid checking in source code from Carthage dependencies.
-
-src/Carthage
-
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the

Jenkinsfile

@@ -5,6 +5,10 @@ pipeline {
     label 'MAC'
   }
 
+  environment {
+    PATH = "$HOME/.rbenv/shims:$PATH"
+  }
+
   options {
     timeout(time: 2, unit: 'HOURS')
     timestamps()
@@ -16,28 +20,19 @@ pipeline {
   }
 
   stages {
-    stage('Unlock keychain') {
+    stage('Prepare') {
       steps {
         withCredentials([usernamePassword(credentialsId: '29a4006b-0d8b-4fe9-9237-b00856bdb0de', passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
           script {
             unlockMACKeychain "${PASSWORD}"
           }
         }
-      }
-    }
-    stage('Clear Carthage temporary items') {
-      steps {
-        sh 'rm -rf ${TMPDIR}/TemporaryItems/*carthage*'
-      }
-    }
-    stage('Prepare') {
-      steps {
-        sh 'make init'
+        sh 'cd src && bundle install'
       }
     }
     stage('Build') {
       steps {
-        sh 'cd src && fastlane build_catty'
+        sh 'cd src && bundle exec fastlane ios build_catty'
       }
       post {
         always {
@@ -49,7 +44,7 @@ pipeline {
     }
     stage('Test') {
       steps {
-        sh 'cd src && fastlane tests'
+        sh 'cd src && bundle exec fastlane ios tests'
       }
     }
   }

Jenkinsfile.release

@@ -4,38 +4,39 @@ pipeline {
   agent {
     label 'MAC'
   }
+
+  environment {
+    PATH = "$HOME/.rbenv/shims:$PATH"
+  }
+
   parameters {
     gitParameter defaultValue: 'origin/master', name: 'gitBranch', type: 'BRANCH', description: 'Select the branch you want to build e.g. origin/master.'
     password name: 'CI_PASSWORD', description: ''
     password name: 'FASTLANE_SESSION', description: ''
     password name: 'FIREBASE_API_KEY', description: ''
     password name: 'FIREBASE_GOOGLE_APP_ID', description: ''
   }
+
   options {
     timeout(time: 2, unit: 'HOURS')
     timestamps()
     buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '30'))
   }
 
   stages {
-    stage('Unlock keychain') {
+    stage('Prepare') {
       steps {
         withCredentials([usernamePassword(credentialsId: '29a4006b-0d8b-4fe9-9237-b00856bdb0de', passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
           script {
             unlockMACKeychain "${PASSWORD}"
           }
         }
-      }
-    }
-
-    stage('Carthage') {
-      steps {
-        sh 'make init'
+        sh 'cd src && bundle install'
       }
     }
     stage('Release') {
       steps {
-        sh 'cd src && fastlane release'
+        sh 'cd src && bundle exec fastlane ios release'
       }
     }
   }

Jenkinsfile.screenshots

@@ -4,39 +4,35 @@ pipeline {
   agent {
     label 'MAC'
   }
+
+  environment {
+    PATH = "$HOME/.rbenv/shims:$PATH"
+  }
+
   parameters {
     gitParameter defaultValue: 'origin/master', name: 'gitBranch', type: 'BRANCH', description: 'Select the branch you want to build e.g. origin/master.'
   }
+
   options {
     timeout(time: 2, unit: 'HOURS')
     timestamps()
     buildDiscarder(logRotator(numToKeepStr: '30', artifactNumToKeepStr: '30'))
   }
 
   stages {
-    stage('Unlock keychain') {
+    stage('Prepare') {
       steps {
         withCredentials([usernamePassword(credentialsId: '29a4006b-0d8b-4fe9-9237-b00856bdb0de', passwordVariable: 'PASSWORD', usernameVariable: 'USERNAME')]) {
           script {
             unlockMACKeychain "${PASSWORD}"
           }
         }
-      }
-    }
-
-    stage('Clear Carthage temporary items') {
-      steps {
-        sh 'rm -rf ${TMPDIR}/TemporaryItems/*carthage*'
-      }
-    }
-    stage('Carthage') {
-      steps {
-        sh 'make init'
+        sh 'cd src && bundle install'
       }
     }
     stage('Take Catty_Screenshots') {
       steps {
-        sh 'cd src && fastlane ios screenshots'
+        sh 'cd src && bundle exec fastlane ios screenshots'
       }
     }
     stage('Save Catty_Screenshots artifacts') {

README.md

@@ -41,9 +41,9 @@ We recommend [Developing iOS 11 Apps with Swift](https://itunes.apple.com/us/cou
 
 ## Start setting up the working environment:
 
-* Install [Xcode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) 13.0 or newer, [Carthage](https://github.com/Carthage/Carthage) and [SwiftLint](https://github.com/realm/SwiftLint).
+* Install [Xcode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) 14.2 or newer and [SwiftLint](https://github.com/realm/SwiftLint)
 
-* Clone this repository, set up the required third-party libraries by executing `make init` within the 'Catty' directory and open [Catty.xcodeproj](src/Catty.xcodeproj)
+* Clone this repository and open [Catty.xcodeproj](src/Catty.xcodeproj)
 
 * If you have any further questions please use our [Google Group](https://groups.google.com/forum/#!forum/catty-ios)
 
@@ -54,7 +54,7 @@ The Following License Header should be used for all header and source files.
 ## License Header (for source and header files)
 <pre lang="objective-c"><code>
 /**
- *  Copyright (C) 2010-2022 The Catrobat Team
+ *  Copyright (C) 2010-2023 The Catrobat Team
  *  (http://developer.catrobat.org/credits)
  *
  *  This program is free software: you can redistribute it and/or modify

src/.ruby-version

@@ -0,0 +1 @@
+3.1.2

src/.swiftlint.auto.yml

@@ -1,11 +1,12 @@
-whitelist_rules: 
+only_rules: 
  - trailing_whitespace
 
 excluded: # paths to ignore during linting. Takes precedence over `included`.
- - Carthage
- - Pods
  - Catty/Defines/LanguageTranslationDefinesSwift.swift
  - CattyUITests/Defines/LanguageTranslationDefinesUI.swift
+ - CattyUISnapshots/Defines/LanguageTranslationDefinesUI.swift
+ - CattyUISnapshots/Supporting Files/SnapshotHelper.swift
  - RunScripts/license-validator.swift
  - RunScripts/precompile-tests.swift
+ - RunScripts/synchronize-localization.swift