Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Kan 151] iOS 빌드 및 필수 요소들 수정 #59

Merged
merged 20 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,8 @@ yarn-error.log
/coverage
node_modules

.env
.env

#google map key
ios/meokguskku/AppDelegate.mm
android/app/src/main/AndroidManifest.xml
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{
"java.configuration.updateBuildConfiguration": "automatic"
"java.configuration.updateBuildConfiguration": "automatic",
"java.compile.nullAnalysis.mode": "automatic"
}
36 changes: 0 additions & 36 deletions android/app/src/main/AndroidManifest.xml

This file was deleted.

Binary file not shown.
Binary file not shown.
34 changes: 17 additions & 17 deletions android/link-assets-manifest.json
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
{
"migIndex": 1,
"data": [
{
"path": "src/assets/fonts/NIXGONFONTS B 2.0.ttf",
"sha1": "88781c5d58a5cf741a7a49d4e52453174b2dfd26"
},
{
"path": "src/assets/fonts/NIXGONFONTS L 2.0.ttf",
"sha1": "32c01029ec1b3268583a67e67e59e72eff1a2bfc"
},
{
"path": "src/assets/fonts/NIXGONFONTS M 2.0.otf",
"sha1": "327e99bd6027f5b210daaa5769fa82ac4cfb03bb"
},
{
"path": "src/assets/fonts/NIXGONFONTS M 2.0.ttf",
"sha1": "970fb9df9c104cd4207a26b5a4b7f8a7657cb2d3"
},
{
"path": "src/assets/fonts/NanumSquareRoundB.ttf",
"sha1": "e92331df4c26e67374cb41c18d4bdf326db8e53d"
"path": "src/assets/fonts/NanumSquareRoundB.otf",
"sha1": "f53cc19057757d5225551ededf8fa3c449891f2f"
},
{
"path": "src/assets/fonts/NanumSquareRoundEB.ttf",
"sha1": "4480112377baeea3de17a1d839da691d978927b7"
"path": "src/assets/fonts/NanumSquareRoundB.ttf",
"sha1": "e92331df4c26e67374cb41c18d4bdf326db8e53d"
},
{
"path": "src/assets/fonts/NanumSquareRoundL.ttf",
"sha1": "d5015ab895abdfd00f8a23105552f153cd953afa"
"path": "src/assets/fonts/NanumSquareRoundEB.otf",
"sha1": "ff91edc64134cc5bd08dd15a0a048e5ffb159da6"
},
{
"path": "src/assets/fonts/NanumSquareRoundOTFB.otf",
"sha1": "f53cc19057757d5225551ededf8fa3c449891f2f"
"path": "src/assets/fonts/NanumSquareRoundEB.ttf",
"sha1": "4480112377baeea3de17a1d839da691d978927b7"
},
{
"path": "src/assets/fonts/NanumSquareRoundOTFEB.otf",
"sha1": "ff91edc64134cc5bd08dd15a0a048e5ffb159da6"
"path": "src/assets/fonts/NanumSquareRoundL.otf",
"sha1": "22d8cc00904d115e1ef898470a08605505d648b7"
},
{
"path": "src/assets/fonts/NanumSquareRoundOTFL.otf",
"sha1": "22d8cc00904d115e1ef898470a08605505d648b7"
"path": "src/assets/fonts/NanumSquareRoundL.ttf",
"sha1": "d5015ab895abdfd00f8a23105552f153cd953afa"
},
{
"path": "src/assets/fonts/NanumSquareRoundOTFR.otf",
"path": "src/assets/fonts/NanumSquareRoundR.otf",
"sha1": "16b0021a98c206f1f9c9e594a0aa1b6cdac51b56"
},
{
Expand Down
9 changes: 8 additions & 1 deletion ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,18 @@ linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Pod::UI.puts "Configuring Pod with #{linkage}ally linked Frameworks".green
use_frameworks! :linkage => linkage.to_sym
end

end

target 'meokguskku' do
config = use_native_modules!

# 구글 맵서비스를 사용하기 위한 설정
pod 'Google-Maps-iOS-Utils', '~> 4.2.2'
rn_maps_path = '../node_modules/react-native-maps'
pod 'react-native-google-maps', :path => rn_maps_path
config = use_native_modules!

use_react_native!(
:path => config[:reactNativePath],
# Enables Flipper.
Expand Down
Loading
Loading