Skip to content

Commit e598500

Browse files
fix: Configure iOS project to connect cmp-shared module (#48)
* fix: Configure iOS project to connect cmp-shared module * chore: Move team ID to Config.xcconfig for dynamic configuration * changed ruby version * fix project.pbxproj
1 parent bd67899 commit e598500

File tree

7 files changed

+42
-29
lines changed

7 files changed

+42
-29
lines changed

.github/workflows/pr-check.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,4 @@ jobs:
8989
desktop_package_name: 'cmp-desktop' # <-- Change Your Desktop Package Name
9090
web_package_name: 'cmp-web' # <-- Change Your Web Package Name
9191
ios_package_name: 'cmp-ios' # <-- Change Your iOS Package Name
92-
build_ios: false # <-- Change to 'false' if you don't want to build iOS
92+
build_ios: true # <-- Change to 'false' if you don't want to build iOS

Gemfile.lock

+21-18
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,22 @@ GEM
99
public_suffix (>= 2.0.2, < 7.0)
1010
artifactory (3.0.17)
1111
atomos (0.1.3)
12-
aws-eventstream (1.3.0)
13-
aws-partitions (1.1029.0)
14-
aws-sdk-core (3.214.1)
12+
aws-eventstream (1.3.2)
13+
aws-partitions (1.1065.0)
14+
aws-sdk-core (3.220.1)
1515
aws-eventstream (~> 1, >= 1.3.0)
1616
aws-partitions (~> 1, >= 1.992.0)
1717
aws-sigv4 (~> 1.9)
18+
base64
1819
jmespath (~> 1, >= 1.6.1)
19-
aws-sdk-kms (1.96.0)
20-
aws-sdk-core (~> 3, >= 3.210.0)
20+
aws-sdk-kms (1.99.0)
21+
aws-sdk-core (~> 3, >= 3.216.0)
2122
aws-sigv4 (~> 1.5)
22-
aws-sdk-s3 (1.176.1)
23-
aws-sdk-core (~> 3, >= 3.210.0)
23+
aws-sdk-s3 (1.182.0)
24+
aws-sdk-core (~> 3, >= 3.216.0)
2425
aws-sdk-kms (~> 1)
2526
aws-sigv4 (~> 1.5)
26-
aws-sigv4 (1.10.1)
27+
aws-sigv4 (1.11.0)
2728
aws-eventstream (~> 1, >= 1.0.2)
2829
babosa (1.0.4)
2930
base64 (0.2.0)
@@ -33,7 +34,7 @@ GEM
3334
commander (4.6.0)
3435
highline (~> 2.0.0)
3536
declarative (0.0.20)
36-
digest-crc (0.6.5)
37+
digest-crc (0.7.0)
3738
rake (>= 12.0.0, < 14.0.0)
3839
domain_name (0.6.20240107)
3940
dotenv (2.8.1)
@@ -67,7 +68,7 @@ GEM
6768
faraday-retry (1.0.3)
6869
faraday_middleware (1.2.1)
6970
faraday (~> 1.0)
70-
fastimage (2.3.1)
71+
fastimage (2.4.0)
7172
fastlane (2.226.0)
7273
CFPropertyList (>= 2.3, < 4.0.0)
7374
addressable (>= 2.8, < 3.0.0)
@@ -137,12 +138,12 @@ GEM
137138
google-apis-core (>= 0.11.0, < 2.a)
138139
google-apis-storage_v1 (0.31.0)
139140
google-apis-core (>= 0.11.0, < 2.a)
140-
google-cloud-core (1.7.1)
141+
google-cloud-core (1.8.0)
141142
google-cloud-env (>= 1.0, < 3.a)
142143
google-cloud-errors (~> 1.0)
143144
google-cloud-env (1.6.0)
144145
faraday (>= 0.17.3, < 3.0)
145-
google-cloud-errors (1.4.0)
146+
google-cloud-errors (1.5.0)
146147
google-cloud-storage (1.47.0)
147148
addressable (~> 2.8)
148149
digest-crc (~> 0.4)
@@ -160,15 +161,17 @@ GEM
160161
highline (2.0.3)
161162
http-cookie (1.0.8)
162163
domain_name (~> 0.5)
163-
httpclient (2.8.3)
164+
httpclient (2.9.0)
165+
mutex_m
164166
jmespath (1.6.2)
165-
json (2.9.1)
167+
json (2.10.2)
166168
jwt (2.10.1)
167169
base64
168170
mini_magick (4.13.2)
169171
mini_mime (1.1.5)
170172
multi_json (1.15.0)
171173
multipart-post (2.4.1)
174+
mutex_m (0.3.0)
172175
nanaimo (0.4.0)
173176
naturally (2.2.1)
174177
nkf (0.2.0)
@@ -182,10 +185,10 @@ GEM
182185
trailblazer-option (>= 0.1.1, < 0.2.0)
183186
uber (< 0.2.0)
184187
retriable (3.1.2)
185-
rexml (3.4.0)
188+
rexml (3.4.1)
186189
rouge (3.28.0)
187190
ruby2_keywords (0.0.5)
188-
rubyzip (2.3.2)
191+
rubyzip (2.4.1)
189192
security (0.1.5)
190193
signet (0.19.0)
191194
addressable (~> 2.8)
@@ -220,8 +223,8 @@ GEM
220223
xcpretty (~> 0.2, >= 0.0.7)
221224

222225
PLATFORMS
226+
arm64-darwin-24
223227
ruby
224-
x64-mingw-ucrt
225228

226229
DEPENDENCIES
227230
fastlane
@@ -232,4 +235,4 @@ RUBY VERSION
232235
ruby 3.3.5p100
233236

234237
BUNDLED WITH
235-
2.5.23
238+
2.6.5

cmp-android/prodRelease-badging.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package: name='cmp.android.app' versionCode='1' versionName='2025.3.3-beta.0.3' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
1+
package: name='cmp.android.app' versionCode='1' versionName='2025.3.3-beta.0.5' platformBuildVersionName='15' platformBuildVersionCode='35' compileSdkVersion='35' compileSdkVersionCodename='15'
22
sdkVersion:'26'
33
targetSdkVersion:'34'
44
uses-permission: name='android.permission.INTERNET'

cmp-ios/Configuration/Config.xcconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
TEAM_ID=
1+
TEAM_ID=L432S2FZP5
22
BUNDLE_ID=cmp.ios
33
APP_NAME=iOSApp

cmp-ios/iosApp.xcodeproj/project.pbxproj

+4-8
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1818
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
1919
2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
20-
7555FF7B242A565900829871 /* MifosPay.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MifosPay.app; sourceTree = BUILT_PRODUCTS_DIR; };
20+
7555FF7B242A565900829871 /* iOSApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iOSApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
2121
7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
2222
7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2323
AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = "<group>"; };
@@ -62,7 +62,7 @@
6262
7555FF7C242A565900829871 /* Products */ = {
6363
isa = PBXGroup;
6464
children = (
65-
7555FF7B242A565900829871 /* MifosPay.app */,
65+
7555FF7B242A565900829871 /* iOSApp.app */,
6666
);
6767
name = Products;
6868
sourceTree = "<group>";
@@ -104,10 +104,8 @@
104104
dependencies = (
105105
);
106106
name = iosApp;
107-
packageProductDependencies = (
108-
);
109107
productName = iosApp;
110-
productReference = 7555FF7B242A565900829871 /* MifosPay.app */;
108+
productReference = 7555FF7B242A565900829871 /* iOSApp.app */;
111109
productType = "com.apple.product-type.application";
112110
};
113111
/* End PBXNativeTarget section */
@@ -135,8 +133,6 @@
135133
Base,
136134
);
137135
mainGroup = 7555FF72242A565900829871;
138-
packageReferences = (
139-
);
140136
productRefGroup = 7555FF7C242A565900829871 /* Products */;
141137
projectDirPath = "";
142138
projectRoot = "";
@@ -175,7 +171,7 @@
175171
);
176172
runOnlyForDeploymentPostprocessing = 0;
177173
shellPath = /bin/sh;
178-
shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :mifospay-shared:embedAndSignAppleFrameworkForXcode\n";
174+
shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :cmp-shared:embedAndSignAppleFrameworkForXcode\n";
179175
};
180176
/* End PBXShellScriptBuildPhase section */
181177

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?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">
3+
<plist version="1.0">
4+
<dict>
5+
<key>SchemeUserState</key>
6+
<dict>
7+
<key>iosApp.xcscheme_^#shared#^_</key>
8+
<dict>
9+
<key>orderHint</key>
10+
<integer>0</integer>
11+
</dict>
12+
</dict>
13+
</dict>
14+
</plist>

0 commit comments

Comments
 (0)