1.0.0-beta01

feat: app - Calendar feat: app - Login/Logout feat: app - Online/Offline Sync Memo feat: server - Login/Logout feat: server - Upsert/Fetch Memo feat: server - Migrate Memo
taetae98coding · Nov 7, 2024 · 68db885 · 68db885
1 parent bb64565
commit 68db885
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 138 deletions.
diff --git a/.github/actions/ci-setup/action.yml b/.github/actions/ci-setup/action.yml
@@ -3,8 +3,37 @@ name: CI setup
 runs:
   using: composite
   steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
     - name: Setup Java 17
       uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '17'
+        java-version: '17'
+
+    - name: Set local.properties
+      shell: bash
+      run: |
+        echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
+        echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
+        echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
+        echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
+        echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
+        echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
+        echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
+        echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
+        echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
+        echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
+        echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
+        echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
+
+    - name: Set xcconfig
+      shell: bash
+      run: |
+        echo DIARY_API_URL = ${{ secrets.DIARY_DEV_API_BASE_URL_APPLE }} >> Diary/dev.xcconfig
+        echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_DEV_API_URL_APPLE }} >> Diary/dev.xcconfig
+        echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_DEV_API_KEY }} >> Diary/dev.xcconfig
+        echo DIARY_API_URL = ${{ secrets.DIARY_REAL_API_BASE_URL_APPLE }} >> Diary/real.xcconfig
+        echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_REAL_API_URL_APPLE }} >> Diary/real.xcconfig
+        echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_REAL_API_KEY }} >> Diary/real.xcconfig
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -13,27 +13,9 @@ jobs:
           './gradlew :app:platform:android:assembleRealRelease',
         ]
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
       - name: Build ${{ matrix.command }}
         run: ${{ matrix.command }}
 
@@ -46,29 +28,5 @@ jobs:
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
-      - name: Set xcconfig
-        run: |
-          echo DIARY_API_URL = ${{ secrets.DIARY_DEV_API_BASE_URL }} >> Diary/dev.xcconfig
-          echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_DEV_API_URL }} >> Diary/dev.xcconfig
-          echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_DEV_API_KEY }} >> Diary/dev.xcconfig
-          echo DIARY_API_URL = ${{ secrets.DIARY_REAL_API_BASE_URL }} >> Diary/real.xcconfig
-          echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_REAL_API_URL }} >> Diary/real.xcconfig
-          echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_REAL_API_KEY }} >> Diary/real.xcconfig
-
       - name: Build iOS
         run: xcodebuild -project Diary/Diary.xcodeproj -scheme CI -destination 'platform=iOS Simulator,name=iPhone 16,OS=18.0'
diff --git a/.github/workflows/check_code_style.yml b/.github/workflows/check_code_style.yml
@@ -6,25 +6,7 @@ jobs:
   Spotless:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
       - run: ./gradlew :spotlessCheck
diff --git a/.github/workflows/dependency_guard.yml b/.github/workflows/dependency_guard.yml
@@ -12,26 +12,8 @@ jobs:
           './gradlew :server:app:dependencyGuard'
         ]
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
       - name: Build ${{ matrix.command }}
         run: ${{ matrix.command }}
diff --git a/.github/workflows/firebase_app_distribution.yml b/.github/workflows/firebase_app_distribution.yml
@@ -10,27 +10,9 @@ jobs:
   Android-Distribution:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
       - name: Build APK
         run: ./gradlew :app:platform:android:assembleRealRelease
 
@@ -39,43 +21,16 @@ jobs:
         with:
           appId: ${{ secrets.FIREBASE_ANDROID_REAL_RELEASE_APP_ID }}
           serviceCredentialsFileContent: ${{ secrets.FIREBASE_APP_DISTRIBUTION_KEY }}
-          groups: Developer,Tester
+          groups: Developer,Android
           file: app/platform/android/build/outputs/apk/real/release/android-real-release.apk
           releaseNotesFile: CHANGELOG.md
 
   iOS-Build:
     runs-on: macos-15
     steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
       - name: CI setup
         uses: './.github/actions/ci-setup'
 
-      - name: Set local.properties
-        run: |
-          echo diary.dev.api.base.url=${{ secrets.DIARY_DEV_API_BASE_URL }} >> local.properties
-          echo diary.real.api.base.url=${{ secrets.DIARY_REAL_API_BASE_URL }} >> local.properties
-          echo holiday.dev.api.url=${{ secrets.HOLIDAY_DEV_API_URL }} >> local.properties
-          echo holiday.dev.api.key=${{ secrets.HOLIDAY_DEV_API_KEY }} >> local.properties
-          echo holiday.real.api.url=${{ secrets.HOLIDAY_REAL_API_URL }} >> local.properties
-          echo holiday.real.api.key=${{ secrets.HOLIDAY_REAL_API_KEY }} >> local.properties
-          echo android.dev.store.password=${{ secrets.ANDROID_DEV_STORE_PASSWORD }} >> local.properties
-          echo android.dev.key.alias=${{ secrets.ANDROID_DEV_KEY_ALIAS }} >> local.properties
-          echo android.dev.key.password=${{ secrets.ANDROID_DEV_KEY_PASSWORD }} >> local.properties
-          echo android.real.store.password=${{ secrets.ANDROID_REAL_STORE_PASSWORD }} >> local.properties
-          echo android.real.key.alias=${{ secrets.ANDROID_REAL_KEY_ALIAS }} >> local.properties
-          echo android.real.key.password=${{ secrets.ANDROID_REAL_KEY_PASSWORD }} >> local.properties
-
-      - name: Set xcconfig
-        run: |
-          echo DIARY_API_URL = ${{ secrets.DIARY_DEV_API_BASE_URL }} >> Diary/dev.xcconfig
-          echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_DEV_API_URL }} >> Diary/dev.xcconfig
-          echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_DEV_API_KEY }} >> Diary/dev.xcconfig
-          echo DIARY_API_URL = ${{ secrets.DIARY_REAL_API_BASE_URL }} >> Diary/real.xcconfig
-          echo HOLIDAY_API_URL = ${{ secrets.HOLIDAY_REAL_API_URL }} >> Diary/real.xcconfig
-          echo HOLIDAY_API_KEY = ${{ secrets.HOLIDAY_REAL_API_KEY }} >> Diary/real.xcconfig
-
       - name: Install the Apple certificate and provisioning profile
         env:
           BUILD_CERTIFICATE_BASE64: ${{ secrets.APPLE_DISTRIBUTION_CERTIFICATE }}
@@ -116,12 +71,15 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: Diary.ipa
-          path: Diary/build/Diary.ipa
+          path: Diary/build/Apps/Diary.ipa
 
   iOS-Distribution:
     needs: [iOS-Build]
     runs-on: ubuntu-latest
     steps:
+      - name: CI setup
+        uses: './.github/actions/ci-setup'
+
       - name: Download ipa
         uses: actions/download-artifact@v4
         with:
@@ -130,9 +88,9 @@ jobs:
       - name: Distribution
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
-          appId: ${{ secrets.FIREBASE_ANDROID_REAL_RELEASE_APP_ID }}
+          appId: ${{ secrets.FIREBASE_IOS_REAL_RELEASE_APP_ID }}
           serviceCredentialsFileContent: ${{ secrets.FIREBASE_APP_DISTRIBUTION_KEY }}
-          groups: Developer,Tester
+          groups: Developer,iOS
           file: Diary.ipa
           releaseNotesFile: CHANGELOG.md
 

diff --git a/Diary/Diary.xcodeproj/project.pbxproj b/Diary/Diary.xcodeproj/project.pbxproj
@@ -249,7 +249,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Diary/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Diary;
+				INFOPLIST_KEY_CFBundleDisplayName = "Diary-RealDebug";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -360,7 +360,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = io.github.taetae98coding.diary;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Provision;
+				"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = adhoc;
 				SWIFT_EMIT_LOC_STRINGS = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
@@ -445,7 +445,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Diary/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Diary;
+				INFOPLIST_KEY_CFBundleDisplayName = "Diary-DevDebug";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
@@ -537,7 +537,7 @@
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = Diary/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = Diary;
+				INFOPLIST_KEY_CFBundleDisplayName = "Diary-DevRelease";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;

diff --git a/Diary/ExportOptions.plist b/Diary/ExportOptions.plist
@@ -4,14 +4,12 @@
 <dict>
 	<key>destination</key>
 	<string>export</string>
-	<key>manageAppVersionAndBuildNumber</key>
-	<true/>
 	<key>method</key>
-	<string>app-store-connect</string>
+	<string>release-testing</string>
 	<key>provisioningProfiles</key>
 	<dict>
 		<key>io.github.taetae98coding.diary</key>
-		<string>Provision</string>
+		<string>adhoc</string>
 	</dict>
 	<key>signingCertificate</key>
 	<string>Apple Distribution</string>
@@ -21,7 +19,7 @@
 	<true/>
 	<key>teamID</key>
 	<string>4TV6L66XZ8</string>
-	<key>uploadSymbols</key>
-	<true/>
+	<key>thinning</key>
+	<string>&lt;thin-for-all-variants&gt;</string>
 </dict>
 </plist>