Skip to content

Commit

Permalink
Merge pull request #59 from faberNovel/release/v12.2.0
Browse files Browse the repository at this point in the history
Release/v12.2.0
  • Loading branch information
Nooba authored Apr 22, 2024
2 parents 791ccbd + 610bca8 commit b7de125
Show file tree
Hide file tree
Showing 12 changed files with 50 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.4
ruby-version: 3.3.0
bundler-cache: true

- name: Bundle install
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.4
ruby-version: 3.3.0
bundler-cache: true

- name: Pods cache
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/prepare_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.1.4
ruby-version: 3.3.0
bundler-cache: true

- name: Bundle install
Expand Down
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ xcuserdata

Pods/

## Gemfile
.ruby-version

##Fastlane
# fastlane specific
fastlane/report.xml
Expand Down
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.3.0
10 changes: 8 additions & 2 deletions ADUtils.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'ADUtils'
spec.version = '12.1.1'
spec.version = '12.2.0'
spec.authors = 'Fabernovel'
spec.homepage = 'https://github.com/faberNovel/ADUtils'
spec.summary = 'Fabernovel\'s toolbox for iOS'
Expand All @@ -15,17 +15,23 @@ Pod::Spec.new do |spec|

spec.subspec 'Swift' do |subspec|
# Subspec compliant with App extensions
subspec.dependency 'ADUtils/Privacy'
subspec.source_files = 'Modules/ADUtils/*.{h,m,swift}'
end

spec.subspec 'Security' do |subspec|
subspec.dependency 'ADUtils/Privacy'
subspec.source_files = 'Modules/ADUtils_security/*.{h,m,swift}'
subspec.framework = 'CryptoKit'
end

spec.subspec 'objc' do |subspec|
subspec.dependency 'ADUtils/Swift'
subspec.source_files = 'Modules/ADUtils_objc/*.{h,m,swift}'
subspec.source_files = 'Modules/ADUtils_objc/*.{h,m,swift}'
end

spec.subspec 'Privacy' do |subspec|
subspec.resource_bundles = {'ADUtilsPrivacy' => ['Modules/PrivacyInfo.xcprivacy']}
end

end
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.

## [Unreleased]

## [12.2.0] - 2024-04-22

### Added
- Add `PrivacyInfo.xcprivacy` to comply with Apple new privacy requirements

## [12.1.1] - 2024-02-22

### Fixed
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
source 'https://rubygems.org'
ruby '3.1.4'
ruby '3.3.0'

gem 'cocoapods', '~> 1.12'
gem 'CFPropertyList', '~> 3.0.0'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ DEPENDENCIES
fastlane-plugin-changelog

RUBY VERSION
ruby 3.1.4p223
ruby 3.3.0p0

BUNDLED WITH
2.3.16
19 changes: 19 additions & 0 deletions Modules/PrivacyInfo.xcprivacy
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?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>NSPrivacyTracking</key>
<false/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>C56D.1</string>
</array>
</dict>
</array>
</dict>
</plist>
3 changes: 2 additions & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ let package = Package(
.target(
name: "ADUtils",
dependencies: [],
path: "Modules"
path: "Modules",
resources: [.copy("PrivacyInfo.xcprivacy")]
)
]
)
17 changes: 10 additions & 7 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
PODS:
- ADUtils (12.1.1):
- ADUtils/objc (= 12.1.1)
- ADUtils/objc (12.1.1):
- ADUtils (12.2.0):
- ADUtils/objc (= 12.2.0)
- ADUtils/objc (12.2.0):
- ADUtils/Swift
- ADUtils/Security (12.1.1)
- ADUtils/Swift (12.1.1)
- ADUtils/Privacy (12.2.0)
- ADUtils/Security (12.2.0):
- ADUtils/Privacy
- ADUtils/Swift (12.2.0):
- ADUtils/Privacy
- Nimble (12.0.1)
- OCMock (3.9.1)
- Quick (7.0.2)
Expand All @@ -30,12 +33,12 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
ADUtils: a3e9fdcfe76222dd3abfa4659ad1e8249ed16c95
ADUtils: 2e849e17af3ec4addadf66cfd0462f6e38f7e6df
Nimble: b279b3ca9e094508778aab5c76417be158d3ad04
OCMock: 9491e4bec59e0b267d52a9184ff5605995e74be8
Quick: efab97aca76d60be86c15daa533b2cdfbe1a74d3
SwiftLint: 4fa9579c63416865179bc416f0a92d55f009600d

PODFILE CHECKSUM: dbed6c6ef27a8c28629f42fe64377e1922cac734

COCOAPODS: 1.13.0
COCOAPODS: 1.15.2

0 comments on commit b7de125

Please sign in to comment.