Skip to content
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
8 changes: 5 additions & 3 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ android {
applicationId "com.ummgoban.momchanpick"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 33 // TODO: update version code
versionName "1.1.2.4" // TODO: update version name
versionCode 36 // TODO: update version code
versionName "1.1.3.2" // TODO: update version name
resValue "string", "NAVER_MAP_CLIENT_ID", project.env.get("NAVER_MAP_CLIENT_ID") ?: ""
resValue "string", "build_config_package", "com.ummgoban.momchanpick"
vectorDrawables.useSupportLibrary = true
}

signingConfigs {
Expand Down Expand Up @@ -143,7 +144,8 @@ dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.drawerlayout:drawerlayout:1.1.1'

implementation project(':react-native-image-crop-picker')

if (hermesEnabled.toBoolean()) {
implementation("com.facebook.react:hermes-android")
} else {
Expand Down
6 changes: 3 additions & 3 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<!-- 이미지/카메라 -->
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" android:maxSdkVersion="32" />
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
<!-- <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" /> -->

<uses-feature android:name="android.hardware.camera" android:required="false"/>

Expand Down Expand Up @@ -63,12 +63,12 @@
</intent-filter>
</activity>

<!-- <service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
<service android:name="com.google.android.gms.metadata.ModuleDependencies" android:enabled="false" android:exported="false">
<intent-filter>
<action android:name="com.google.android.gms.metadata.MODULE_DEPENDENCIES" />
</intent-filter>
<meta-data android:name="photopicker_activity:0:required" android:value="" />
</service> -->
</service>

</application>
</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import com.facebook.react.ReactActivity
import com.facebook.react.ReactActivityDelegate
import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint.fabricEnabled
import com.facebook.react.defaults.DefaultReactActivityDelegate
import org.devio.rn.splashscreen.SplashScreen;
import org.devio.rn.splashscreen.SplashScreen

class MainActivity : ReactActivity() {

Expand Down
1 change: 1 addition & 0 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ buildscript {
google()
mavenCentral()
maven { url 'https://www.jitpack.io' }
maven { url 'https://maven.google.com' }
maven { url 'https://devrepo.kakao.com/nexus/content/groups/public/' }
}
dependencies {
Expand Down
4 changes: 3 additions & 1 deletion android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ rootProject.name = 'ClientApp'
include ':app'
includeBuild('../node_modules/@react-native/gradle-plugin')
include ':react-native-config'
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
include ':react-native-image-crop-picker'
project(':react-native-config').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-config/android')
project(':react-native-image-crop-picker').projectDir = new File(settingsDir, '../node_modules/react-native-image-crop-picker/android')
8 changes: 4 additions & 4 deletions ios/ClientApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -577,7 +577,7 @@
BUNDLE_IDENTIFIER = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ClientApp/ClientApp.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 21;
DEVELOPMENT_TEAM = 3P5SZ6DAC9;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = ClientApp/Info.plist;
Expand All @@ -586,7 +586,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
MARKETING_VERSION = 1.1.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand All @@ -609,15 +609,15 @@
BUNDLE_IDENTIFIER = "";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = ClientApp/ClientApp.entitlements;
CURRENT_PROJECT_VERSION = 5;
CURRENT_PROJECT_VERSION = 21;
DEVELOPMENT_TEAM = 3P5SZ6DAC9;
INFOPLIST_FILE = ClientApp/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "맘찬픽";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.1.2;
MARKETING_VERSION = 1.1.3;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
2 changes: 1 addition & 1 deletion ios/ClientApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>12</string>
<string>21</string>
<key>KAKAO_APP_KEY</key>
<string>$(KAKAO_KEY)</string>
<key>LSApplicationQueriesSchemes</key>
Expand Down
2 changes: 1 addition & 1 deletion ios/ClientAppTests/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>12</string>
<string>21</string>
</dict>
</plist>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ClientApp",
"version": "1.1.2",
"version": "1.1.3",
"private": true,
"scripts": {
"android": "cp .env.development .env && npx react-native run-android",
Expand Down