Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Gallet committed Jan 8, 2021
2 parents a76ce22 + 510875f commit ffb2f92
Show file tree
Hide file tree
Showing 14 changed files with 209 additions and 196 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: CD

on:
push:
branches:
- master

jobs:
build:

runs-on: macOS-latest

steps:
- uses: actions/checkout@v2

- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5

- name: Bundle install
run: bundle install

- name: Publish release
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN_CI }}
COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TOKEN_CI }}
run: bundle exec fastlane publish_release
43 changes: 43 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: CI

on:
push:
branches-ignore:
- master

jobs:
build:

runs-on: macOS-latest

steps:
- uses: actions/checkout@v2

- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5

- name: Ruby cache
uses: actions/cache@v1
with:
path: vendor/bundle
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
restore-keys: |
${{ runner.os }}-gems-
- name: Bundle install
run: |
bundle config path vendor/bundle
bundle check || bundle install
- name: Pods cache
uses: actions/cache@v1
with:
path: Pods
key: ${{ runner.os }}-cocoapods-${{ hashFiles('**/Podfile.lock') }}

- name: Pod install
run: |
if [ ! -d "Pods" ]; then
bundle exec pod install
fi
- name: Build and test
run: bundle exec fastlane ci_check
25 changes: 25 additions & 0 deletions .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: Create release PRs

on:
create

jobs:
build:

runs-on: macOS-latest

if: contains(github.ref, 'release') # allow to filter on release branches only
steps:
- uses: actions/checkout@v2

- uses: ruby/setup-ruby@v1
with:
ruby-version: 2.6.5

- name: Bundle install
run: bundle install

- name: Prepare release
env:
GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN_CI }}
run: bundle exec fastlane create_release_pr
2 changes: 1 addition & 1 deletion ADFormController.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Pod::Spec.new do |spec|
spec.summary = 'Applidium\'s form controller'
spec.platform = 'ios', '10.0'
spec.license = { :type => 'Commercial', :text => 'Created and licensed by Applidium. Copyright 2016 Applidium. All rights reserved.' }
spec.source = { :git => 'ssh://git@codereview.technologies.fabernovel.com:29418/ADFormController', :tag => "v#{spec.version}" }
spec.source = { :git => 'git@github.com:faberNovel/ADFormController.git', :tag => "v#{spec.version}" }
spec.source_files = 'Modules/ADFormController/Classes/*.{h,m,swift}'
spec.resource_bundle = {'ADFormController' => 'Modules/ADFormController/Ressources/InputAccessoryView.xcassets'}
spec.framework = 'Foundation', 'UIKit'
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file.
`ADFormController` adheres to [Semantic Versioning](http://semver.org/).


## [6.0.3]

### Fix
- Use cache to reuse formcontroller's cells

## [6.0.1]

### Added
Expand Down
1 change: 0 additions & 1 deletion Classes/FDTestFormTableViewController.m
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#import "FDSharedObjectiveCHeader.h"
#import "FDFormModel.h"
#import <CocoaLumberjack/CocoaLumberjack.h>
#import <ADDynamicLogLevel/ADDynamicLogLevel.h>

typedef NS_ENUM(NSUInteger, FDRowType) {
FDRowTypeGender,
Expand Down
4 changes: 0 additions & 4 deletions FormDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -580,7 +580,6 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Form-FormDemoTests/Pods-Form-FormDemoTests-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/ADDynamicLogLevel/ADDynamicLogLevel.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/ADFormController/ADFormController.framework",
"${BUILT_PRODUCTS_DIR}/ADKeyboardManager/ADKeyboardManager.framework",
Expand All @@ -592,7 +591,6 @@
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADDynamicLogLevel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADFormController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADKeyboardManager.framework",
Expand Down Expand Up @@ -647,7 +645,6 @@
);
inputPaths = (
"${PODS_ROOT}/Target Support Files/Pods-Form-FormDemo/Pods-Form-FormDemo-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/ADDynamicLogLevel/ADDynamicLogLevel.framework",
"${BUILT_PRODUCTS_DIR}/CocoaLumberjack/CocoaLumberjack.framework",
"${BUILT_PRODUCTS_DIR}/ADFormController/ADFormController.framework",
"${BUILT_PRODUCTS_DIR}/ADKeyboardManager/ADKeyboardManager.framework",
Expand All @@ -657,7 +654,6 @@
);
name = "[CP] Embed Pods Frameworks";
outputPaths = (
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADDynamicLogLevel.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaLumberjack.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADFormController.framework",
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/ADKeyboardManager.framework",
Expand Down
54 changes: 2 additions & 52 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
GIT
remote: ssh://[email protected]:29418/ADFastlane
revision: c51b83c2930af4a4a8d72f09188b72f7b651a1a6
branch: develop
specs:
fastlane-plugin-ft_internal (0.1.0)
ad_localize
fastlane-plugin-appcenter
fastlane-plugin-automated_test_emulator_run
fastlane-plugin-aws_s3 (>= 1.7.0)
fastlane-plugin-badge
fastlane-plugin-demo_mode
slather (< 3.0)

GEM
remote: https://rubygems.org/
specs:
Expand All @@ -21,19 +7,11 @@ GEM
i18n (>= 0.7, < 2)
minitest (~> 5.1)
tzinfo (~> 1.1)
ad_localize (4.0.3)
activesupport (>= 5.2, < 7.0)
colorize (~> 0.8)
google-api-client (~> 0.34)
googleauth (~> 0.12)
nokogiri (~> 1.10)
addressable (2.7.0)
public_suffix (>= 2.0.2, < 5.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
apktools (0.7.4)
rubyzip (~> 2.0)
atomos (0.1.3)
aws-eventstream (1.1.0)
aws-partitions (1.387.0)
Expand All @@ -52,13 +30,7 @@ GEM
aws-sigv4 (1.2.2)
aws-eventstream (~> 1, >= 1.0.2)
babosa (1.0.4)
badge (0.12.0)
curb (~> 0.9)
fastimage (>= 1.6)
fastlane (>= 2.0)
mini_magick (>= 4.9.4, < 5.0.0)
claide (1.0.3)
clamp (1.3.2)
cocoapods (1.10.0)
addressable (~> 2.6)
claide (>= 1.0.2, < 2.0)
Expand Down Expand Up @@ -98,11 +70,9 @@ GEM
cocoapods-try (1.2.0)
colored (1.2)
colored2 (3.1.2)
colorize (0.8.1)
commander-fastlane (4.4.6)
highline (~> 1.7.2)
concurrent-ruby (1.1.7)
curb (0.9.10)
declarative (0.0.20)
declarative-option (0.1.0)
digest-crc (0.6.1)
Expand Down Expand Up @@ -160,15 +130,7 @@ GEM
xcodeproj (>= 1.13.0, < 2.0.0)
xcpretty (~> 0.3.0)
xcpretty-travis-formatter (>= 0.0.3)
fastlane-plugin-appcenter (1.10.0)
fastlane-plugin-automated_test_emulator_run (1.6.0)
fastlane-plugin-aws_s3 (1.8.0)
apktools (~> 0.7)
aws-sdk-s3 (~> 1)
mime-types (~> 3.3)
fastlane-plugin-badge (1.4.0)
badge (~> 0.12.0)
fastlane-plugin-demo_mode (1.0.2)
fastlane-plugin-changelog (0.15.0)
ffi (1.13.1)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
Expand Down Expand Up @@ -211,12 +173,8 @@ GEM
json (2.3.1)
jwt (2.2.2)
memoist (0.16.2)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2020.0512)
mini_magick (4.10.1)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.14.2)
molinillo (0.6.6)
multi_json (1.15.0)
Expand All @@ -225,8 +183,6 @@ GEM
nap (1.1.0)
naturally (2.2.0)
netrc (0.11.0)
nokogiri (1.10.10)
mini_portile2 (~> 2.4.0)
os (1.1.1)
plist (3.5.0)
public_suffix (4.0.6)
Expand All @@ -250,12 +206,6 @@ GEM
CFPropertyList
naturally
slack-notifier (2.3.2)
slather (2.5.0)
CFPropertyList (>= 2.2, < 4)
activesupport
clamp (~> 1.3)
nokogiri (~> 1.8)
xcodeproj (~> 1.7)
terminal-notifier (2.0.0)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
Expand Down Expand Up @@ -292,7 +242,7 @@ DEPENDENCIES
CFPropertyList (= 2.3.6)
cocoapods (= 1.10.0)
fastlane
fastlane-plugin-ft_internal!
fastlane-plugin-changelog

RUBY VERSION
ruby 2.6.5p114
Expand Down
4 changes: 3 additions & 1 deletion Modules/ADFormController/Classes/FormController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,9 @@ private extension FormInput {
guard let configuration = delegate?.configurationForFormController(self, at: indexPath) else {
return UITableViewCell()
}
return configuration.visit(self, at: indexPath)
let cell = configuration.visit(self, at: indexPath)
cells[indexPath] = cell
return cell
}

@objc(beginEditingAtIndexPath:)
Expand Down
4 changes: 1 addition & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
source 'ssh://[email protected]:29418/CocoaPodsSpecs'
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '10.0'
use_frameworks!

pod 'CocoaLumberjack/Swift', '~> 3.5', :inhibit_warnings => true
pod 'ADDynamicLogLevel', '~> 2.0', :inhibit_warnings => true

abstract_target 'Form' do
pod 'ADFormController', :path => './'

target 'FormDemo' do
pod 'Alamofire', '~> 4.8'
pod 'Watchdog', '~> 4.0'
pod 'ADUtils', '~> 9.3'
pod 'ADUtils', '~> 10.0'
end

target 'FormDemoTests' do
Expand Down
24 changes: 8 additions & 16 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
PODS:
- ADDynamicLogLevel (2.1.0):
- CocoaLumberjack (~> 3.0)
- ADFormController (6.0.3):
- ADKeyboardManager (~> 6.0)
- ADKeyboardManager (6.0.0)
- ADUtils (9.4.0):
- ADUtils/objc (= 9.4.0)
- ADUtils/objc (9.4.0):
- ADUtils (10.5.0):
- ADUtils/objc (= 10.5.0)
- ADUtils/objc (10.5.0):
- ADUtils/Swift
- ADUtils/Swift (9.4.0)
- ADUtils/Swift (10.5.0)
- Alamofire (4.9.1)
- CocoaLumberjack (3.7.0):
- CocoaLumberjack/Core (= 3.7.0)
- CocoaLumberjack/Core (3.7.0)
- CocoaLumberjack/Swift (3.7.0):
- CocoaLumberjack/Core
Expand All @@ -32,9 +28,8 @@ PODS:
- Watchdog (4.0)

DEPENDENCIES:
- ADDynamicLogLevel (~> 2.0)
- ADFormController (from `./`)
- ADUtils (~> 9.3)
- ADUtils (~> 10.0)
- Alamofire (~> 4.8)
- CocoaLumberjack/Swift (~> 3.5)
- FBSnapshotTestCase (~> 2.1)
Expand All @@ -56,18 +51,15 @@ SPEC REPOS:
- OCMock
- Quick
- Watchdog
"ssh://[email protected]:29418/CocoaPodsSpecs":
- ADDynamicLogLevel

EXTERNAL SOURCES:
ADFormController:
:path: "./"

SPEC CHECKSUMS:
ADDynamicLogLevel: 7b576c84ef7a96ae1aa115e66516fc68f1e86de1
ADFormController: 95290c99fc0264e0335d090e61cf595c0b324009
ADFormController: 8958aee18f0e1cf43726f9ed80cbdfdac3c6347c
ADKeyboardManager: a9dce48b8d2306c1fca5deb46d04fa8472516fe2
ADUtils: c3521517403e01ae41ea9e37235fd637777f574c
ADUtils: 67372e355673bbc53f6843423dc78ebf3771f8ec
Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
CocoaLumberjack: e8955b9d337ac307103b0a34fd141c32f27e53c5
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
Expand All @@ -77,6 +69,6 @@ SPEC CHECKSUMS:
Quick: f5754d69b7013f5864c29aab9ae6f0c79c5bc200
Watchdog: 370d2c2a58c9bede0e3f9b8cc26bf297745c31c2

PODFILE CHECKSUM: dadcf27961b92a3718adc4924741ea82ddfcfa37
PODFILE CHECKSUM: cde55cffb8e485ca348a8af64bd4a55211c4b9d9

COCOAPODS: 1.10.0
3 changes: 3 additions & 0 deletions fastlane/.env.default
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
PODSPEC = "ADFormController.podspec"
CHANGELOG = "CHANGELOG.md"
REPO = "faberNovel/ADFormController"
Loading

0 comments on commit ffb2f92

Please sign in to comment.