Skip to content

Commit d28ac5f

Browse files
DenielGriniwwwanow
authored andcommitted
Feat/iternal app testing (#7)
* style: Rename file key * chore: Changed getting value Feat/iternal app testing (#8) * style: Rename file key * chore: Changed getting value * fix: Corrected action type indication chore(common): remove pods from git chore(deps): upgrade REES46 pod to v3.6.58 fix(notifications): clean up deprecated SDK methods fix(sdk): update sdk initialization feat(github): action feat(github): action feat(github): action refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless feat(github): secrets feat(github): secrets feat(github): secrets refactor(github): useless refactor(github): useless fix(sdk): remove feature and core from targets fix(sdk): disable signing for pods feat(common): gitignore fix(common): exportoptions method fix(sdk): add provisioning profile to ExportOptions.plist refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless refactor(github): useless
1 parent dde137b commit d28ac5f

File tree

197 files changed

+76
-17529
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+76
-17529
lines changed

.github/workflows/publish.yaml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
name: Publish to TestFlight and Bump Version
22

33
on:
4-
push:
4+
pull_request:
5+
types:
6+
- closed
57
branches:
68
- master
79

810
jobs:
911
publish_and_version_bump:
10-
uses: rees46/workflow/.github/workflows/reusable-ios-testflight-publish.yml@master
12+
if: github.event.pull_request.merged == true
13+
uses: rees46/workflow/.github/workflows/reusable-ios-testflight-publish.yaml@master
1114
with:
12-
app_identifier: "com.rees46.demo-shop"
13-
ipa_file: "build/demo-store-ios.ipa"
14-
PROPERTIES_FILE: "version.properties"
15-
xcworkspace: "demo-store-ios.xcworkspace"
1615
scheme: "demo-store-ios"
17-
export_options_plist: "ExportOptions.plist"
16+
xcworkspace: "demo-store-ios.xcworkspace"
17+
codeSignIdentity: "Apple Distribution: M.Kechinov's web-development studio, LLC (MYA32EHWN4)"
18+
developmentTeam: "MYA32EHWN4"
19+
provisioningProfileSpecifier: "demo-ios"
1820
secrets:
21+
GITHUB_APP_ID: ${{ vars.PUBLIVERSIONER_ID }}
22+
GITHUB_APP_PRIVATE_KEY: ${{ secrets.PUBLIVERSIONER_SECRET }}
1923
APP_STORE_CONNECT_API_KEY_ID: ${{ secrets.APP_STORE_CONNECT_API_KEY_ID }}
2024
APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
2125
APP_STORE_CONNECT_API_KEY: ${{ secrets.APP_STORE_CONNECT_API_KEY_AS_BASE64_STRING }}
22-
GITHUB_APP_ID: ${{ secrets.PUBLIVERSIONER_ID }}
23-
GITHUB_APP_PRIVATE_KEY: ${{ secrets.PUBLIVERSIONER_SECRET }}
26+
IOS_CERTIFICATE_P12: ${{ secrets.IOS_CERTIFICATE_P12 }}
27+
IOS_CERTIFICATE_PASSWORD: ${{ secrets.IOS_CERTIFICATE_PASSWORD }}
28+
IOS_PROVISIONING_PROFILE: ${{ secrets.IOS_PROVISIONING_PROFILE }}

.github/workflows/sync.yaml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Sync repositories
2+
3+
on:
4+
pull_request:
5+
workflow_run:
6+
workflows:
7+
- "Bump version, create release and publish"
8+
types:
9+
- completed
10+
workflow_dispatch:
11+
12+
jobs:
13+
run:
14+
if: github.event.workflow_run.conclusion == 'success' || github.event_name == 'workflow_dispatch'
15+
uses: rees46/workflow/.github/workflows/reusable-ios-synchronization.yaml@master
16+
permissions: write-all
17+
secrets:
18+
token: ${{ secrets.JADE_SMITH_BOT_TOKEN }}
19+
with:
20+
targetRepository: personaclick/ios-sdk

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,5 @@ Pods/
140140
# End of https://www.gitignore.io/api/xcode,swift,macos,objective-c
141141
/fastlane/fastlane/Appfile
142142
/Gemfile.lock
143+
144+
.local/

App/Info.plist

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CFBundleVersion</key>
6+
<string>3</string>
7+
<key>CFBundleShortVersionString</key>
8+
<string>1.0.0</string>
59
<key>NSAppTransportSecurity</key>
610
<dict>
711
<key>NSAllowsArbitraryLoads</key>

Core/Presentation/ViewModel/SdkManager.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ class SDKManager: SDKManaging {
1313
apiDomain: AppConfigVariables.apiDomain,
1414
stream: AppConfigVariables.sdkStream,
1515
enableLogs: true,
16-
autoSendPushToken: true
16+
autoSendPushToken: true,
17+
parentViewController: UIApplication.shared.windows.first?.rootViewController,
18+
needReInitialization: true
1719
) { error in
1820
if let error = error {
1921
print("SDK Initialization failed: \(error.localizedDescription)")

ExportOptions.plist

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"\>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
4-
<dict>
5-
<key>method</key>
6-
<string>app-store</string>
7-
<key>uploadSymbols</key>
8-
<true/>
9-
<key>uploadBitcode</key>
10-
<false/>
11-
</dict>
4+
<dict>
5+
<key>method</key>
6+
<string>app-store</string>
7+
<key>uploadSymbols</key>
8+
<true/>
9+
<key>uploadBitcode</key>
10+
<false/>
11+
<key>provisioningProfiles</key>
12+
<dict>
13+
<key>com.rees46.demo-shop</key>
14+
<string>demo-ios</string>
15+
</dict>
16+
</dict>
1217
</plist>

Feature/Home/Presentation/View/InAppNotification/Controller/NotificationWidgetController.swift

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ class NotificationWidgetController: ObservableObject {
1818
negativeButtonText: NSLocalizedString("notification_decline_button", comment: ""),
1919
onPositiveButtonClick: {
2020
print("Alert Accepted")
21-
},
22-
onNegativeButtonClick: {
23-
print("Alert Declined")
2421
}
2522
)
2623
}
@@ -34,9 +31,6 @@ class NotificationWidgetController: ObservableObject {
3431
negativeButtonText: NSLocalizedString("notification_decline_button", comment: ""),
3532
onPositiveButtonClick: {
3633
print("Bottom Sheet Accepted")
37-
},
38-
onNegativeButtonClick: {
39-
print("Bottom Sheet Declined")
4034
}
4135
)
4236
}
@@ -50,9 +44,6 @@ class NotificationWidgetController: ObservableObject {
5044
negativeButtonText: NSLocalizedString("notification_decline_button", comment: ""),
5145
onPositiveButtonClick: {
5246
print("Full Screen Alert Accepted")
53-
},
54-
onNegativeButtonClick: {
55-
print("Full Screen Alert Declined")
5647
}
5748
)
5849
}

Info.plist

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5-
5+
6+
<key>CFBundleVersion</key>
7+
<string>3</string>
8+
<key>CFBundleShortVersionString</key>
9+
<string>1.0.0</string>
610

711
<key>NSAppTransportSecurity</key>
812
<dict>

Podfile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ platform :ios, '13.0'
33
target 'demo-store-ios' do
44
use_frameworks!
55

6-
pod 'REES46', :git => 'https://github.com/rees46/ios-sdk.git', :branch => 'master', :tag => '3.6.40'
6+
pod 'REES46', :git => 'https://github.com/rees46/ios-sdk.git', :branch => 'master', :tag => '3.6.58'
77
pod "Resolver"
88

99
end
1010

1111
post_install do |installer|
1212
installer.pods_project.targets.each do |target|
1313
target.build_configurations.each do |config|
14+
config.build_settings['EXPANDED_CODE_SIGN_IDENTITY'] = ""
15+
config.build_settings['CODE_SIGNING_REQUIRED'] = "NO"
16+
config.build_settings['CODE_SIGNING_ALLOWED'] = "NO"
1417
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.0'
1518
xcconfig_path = config.base_configuration_reference.real_path
1619
xcconfig = File.read(xcconfig_path)

Podfile.lock

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- REES46 (3.6.40)
2+
- REES46 (3.6.58)
33
- Resolver (1.5.1)
44

55
DEPENDENCIES:
6-
- REES46 (from `https://github.com/rees46/ios-sdk.git`, branch `master`, tag `3.6.40`)
6+
- REES46 (from `https://github.com/rees46/ios-sdk.git`, branch `master`, tag `3.6.58`)
77
- Resolver
88

99
SPEC REPOS:
@@ -14,18 +14,18 @@ EXTERNAL SOURCES:
1414
REES46:
1515
:branch: master
1616
:git: https://github.com/rees46/ios-sdk.git
17-
:tag: 3.6.40
17+
:tag: 3.6.58
1818

1919
CHECKOUT OPTIONS:
2020
REES46:
21-
:commit: c4871cef4787f191d6afbdce6daedf43f1a65b8a
21+
:commit: 24b33c87e73dec2eb8e82b641fc2a7712bccb5d7
2222
:git: https://github.com/rees46/ios-sdk.git
23-
:tag: 3.6.40
23+
:tag: 3.6.58
2424

2525
SPEC CHECKSUMS:
26-
REES46: a10ed6d2091d2a44572ec7df65bec632d0e8fa3e
26+
REES46: aaf11c8ef6382ca6eb649d0919875d100151e5bc
2727
Resolver: 0e2ce51257e9366c54afe1b9e9be25059e9b9300
2828

29-
PODFILE CHECKSUM: c6a54df364be4afbc94df09d59602e9b9f5e1c33
29+
PODFILE CHECKSUM: 2e8983ec0dff4d9166fb49e27b81e36cbd77b11e
3030

31-
COCOAPODS: 1.15.2
31+
COCOAPODS: 1.16.2

0 commit comments

Comments
 (0)