diff --git a/android/app/build.gradle b/android/app/build.gradle index 488a8e86..bba638a7 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -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 { @@ -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 { diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b8375c24..b617d2e9 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -10,7 +10,7 @@ - + @@ -63,12 +63,12 @@ - + diff --git a/android/app/src/main/java/com/ummgoban/momchanpick/MainActivity.kt b/android/app/src/main/java/com/ummgoban/momchanpick/MainActivity.kt index 6e184a6f..827a85be 100644 --- a/android/app/src/main/java/com/ummgoban/momchanpick/MainActivity.kt +++ b/android/app/src/main/java/com/ummgoban/momchanpick/MainActivity.kt @@ -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() { diff --git a/android/build.gradle b/android/build.gradle index a0bd79ab..b27210fa 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -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 { diff --git a/android/settings.gradle b/android/settings.gradle index f10564a1..e46e73a3 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -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') \ No newline at end of file +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') \ No newline at end of file diff --git a/ios/ClientApp.xcodeproj/project.pbxproj b/ios/ClientApp.xcodeproj/project.pbxproj index 9012bf19..16a1588a 100644 --- a/ios/ClientApp.xcodeproj/project.pbxproj +++ b/ios/ClientApp.xcodeproj/project.pbxproj @@ -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; @@ -586,7 +586,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.2; + MARKETING_VERSION = 1.1.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", @@ -609,7 +609,7 @@ 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 = "맘찬픽"; @@ -617,7 +617,7 @@ "$(inherited)", "@executable_path/Frameworks", ); - MARKETING_VERSION = 1.1.2; + MARKETING_VERSION = 1.1.3; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", diff --git a/ios/ClientApp/Info.plist b/ios/ClientApp/Info.plist index fa404d8f..82ff2332 100644 --- a/ios/ClientApp/Info.plist +++ b/ios/ClientApp/Info.plist @@ -42,7 +42,7 @@ CFBundleVersion - 12 + 21 KAKAO_APP_KEY $(KAKAO_KEY) LSApplicationQueriesSchemes diff --git a/ios/ClientAppTests/Info.plist b/ios/ClientAppTests/Info.plist index 98d23138..3570ffd9 100644 --- a/ios/ClientAppTests/Info.plist +++ b/ios/ClientAppTests/Info.plist @@ -19,6 +19,6 @@ CFBundleSignature ???? CFBundleVersion - 12 + 21 diff --git a/package.json b/package.json index ce81d44b..1428cc2e 100644 --- a/package.json +++ b/package.json @@ -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",