Merge pull request #224 from Monday-Rocket/develop

1.0.66 android hotfix deploy
Monday-Rocket · Oct 21, 2024 · 167c867 · 167c867
2 parents 87b16d7 + adf7cb2
commit 167c867
Show file tree

Hide file tree

Showing 96 changed files with 2,381 additions and 1,720 deletions.
diff --git a/.github/workflows/android_cicd.yml b/.github/workflows/android_cicd.yml
@@ -16,7 +16,7 @@ jobs:
           java-version: '11.x'
       - uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.13.3'
+          flutter-version: '3.24.3'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'

diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml
@@ -16,7 +16,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.24.3'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'
@@ -60,7 +60,7 @@ jobs:
           java-version: '11.x'
       - uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.24.3'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'

diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.24.3'
       - name: Install packages
         run: flutter pub get
       - run: echo '${{ secrets.DOTENV }}' | base64 -d > .env

diff --git a/.github/workflows/ios_cicd.yml b/.github/workflows/ios_cicd.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: subosito/flutter-action@v2.8.0
         with:
-          flutter-version: '3.13.6'
+          flutter-version: '3.24.3'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1.2'

diff --git a/.gitignore b/.gitignore
@@ -53,4 +53,8 @@ lib/firebase_options.dart
 .env
 
 # test coverage
-coverage
+coverage
+
+# FVM Version Cache
+.fvm/
+.fvmrc
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -1,3 +1,12 @@
+plugins {
+    id "com.android.application"
+    id "dev.flutter.flutter-gradle-plugin"
+    id "kotlin-android"
+    id "kotlin-parcelize"
+    id 'com.google.gms.google-services'
+    id 'com.google.firebase.crashlytics'
+}
+
 def localProperties = new Properties()
 def localPropertiesFile = rootProject.file('local.properties')
 if (localPropertiesFile.exists()) {
@@ -6,11 +15,6 @@ if (localPropertiesFile.exists()) {
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new FileNotFoundException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
     flutterVersionCode = 1
@@ -33,16 +37,8 @@ def _keyPassword = signingProperties.getProperty('key.password')
 def _storePassword = signingProperties.getProperty('store.password')
 def kakaoApiKey = signingProperties.getProperty('kakao.api.key')
 
-apply plugin: 'com.android.application'
-// START: FlutterFire Configuration
-apply plugin: 'com.google.gms.google-services'
-// END: FlutterFire Configuration
-apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-parcelize'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -64,7 +60,7 @@ android {
     defaultConfig {
         applicationId "com.mr.ac_project_app"
         minSdkVersion 24
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         ndk.debugSymbolLevel 'FULL'
@@ -96,8 +92,6 @@ flutter {
 }
 
 dependencies {
-    //noinspection GradleDependency,DifferentStdlibGradleVersion
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     //noinspection GradleDependency
     implementation 'androidx.appcompat:appcompat:1.4.2'
     implementation 'androidx.activity:activity-ktx:1.6.1'

diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
+    <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
     <application
         android:name=".LinkPoolApp"

diff --git a/android/build.gradle b/android/build.gradle
@@ -1,19 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.7.10'
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
-        // START: FlutterFire Configuration
-        classpath 'com.google.gms:google-services:4.3.15'
-        // END: FlutterFire Configuration
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -31,4 +15,4 @@ subprojects {
 
 tasks.register("clean", Delete) {
     delete rootProject.buildDir
-}
+}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,11 +1,27 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.4.2" apply false
+    id "org.jetbrains.kotlin.android" version "1.9.25" apply false
+    id 'com.google.gms.google-services' version '4.3.15' apply false
+    id 'com.google.firebase.crashlytics' version '2.8.1' apply false
+}
+
+include ":app"
diff --git a/devtools_options.yaml b/devtools_options.yaml
@@ -0,0 +1 @@
+extensions:
diff --git a/ios/.gitignore b/ios/.gitignore
@@ -40,4 +40,5 @@ firebase_app_id_file.json
 fastlane/README.md
 Runner.ipa
 Runner.app.*
-Secrets.xcconfig
+Secrets.xcconfig
+/Runner.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ios/Extension/Base.lproj/MainInterface.storyboard b/ios/Extension/Base.lproj/MainInterface.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="21701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mre-9g-jvc">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="mre-9g-jvc">
     <device id="retina6_0" orientation="portrait" appearance="dark"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21678"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22684"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="collection view cell content view" minToolsVersion="11.0"/>
@@ -599,24 +599,24 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2tU-tH-q3K">
-                                <rect key="frame" x="0.0" y="500" width="390" height="344"/>
+                                <rect key="frame" x="0.0" y="509.66666666666674" width="390" height="334.33333333333326"/>
                                 <subviews>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="BmU-qZ-2dX">
-                                        <rect key="frame" x="80.666666666666686" y="30" width="229" height="28"/>
+                                        <rect key="frame" x="79.666666666666686" y="29.999999999999943" width="231" height="28"/>
                                         <subviews>
                                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="check" translatesAutoresizingMaskIntoConstraints="NO" id="n5j-la-mOo">
                                                 <rect key="frame" x="0.0" y="0.0" width="28" height="28"/>
                                             </imageView>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="선택한 폴더에 저장 완료!" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Gba-zs-czL">
-                                                <rect key="frame" x="36" y="0.0" width="193" height="28"/>
+                                                <rect key="frame" x="36" y="0.0" width="195" height="28"/>
                                                 <fontDescription key="fontDescription" name="Pretendard-Bold" family="Pretendard" pointSize="20"/>
                                                 <color key="textColor" name="grey900"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                         </subviews>
                                     </stackView>
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="7" translatesAutoresizingMaskIntoConstraints="NO" id="S0r-5G-CQ0">
-                                        <rect key="frame" x="24" y="254" width="342" height="56"/>
+                                        <rect key="frame" x="24" y="244.33333333333331" width="342" height="56"/>
                                         <subviews>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CZr-r3-TNF">
                                                 <rect key="frame" x="0.0" y="0.0" width="167.66666666666666" height="56"/>
@@ -647,7 +647,7 @@
                                         </constraints>
                                     </stackView>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kCf-F8-jUv">
-                                        <rect key="frame" x="346" y="30" width="24" height="24"/>
+                                        <rect key="frame" x="346" y="29.999999999999943" width="24" height="24"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="24" id="BV9-t2-OTd"/>
                                             <constraint firstAttribute="width" constant="24" id="unD-xe-2S1"/>
@@ -665,7 +665,7 @@
                                         </connections>
                                     </button>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="I3T-es-uVz">
-                                        <rect key="frame" x="145" y="90" width="100" height="100"/>
+                                        <rect key="frame" x="145" y="89.999999999999943" width="100" height="100"/>
                                         <constraints>
                                             <constraint firstAttribute="height" constant="100" id="Joj-6x-gwH"/>
                                             <constraint firstAttribute="width" constant="100" id="g1P-A7-kuR"/>
@@ -678,7 +678,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </imageView>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="F91-Km-a1f" customClass="PaddingLabel" customModule="Extension" customModuleProvider="target">
-                                        <rect key="frame" x="165.66666666666666" y="196" width="58.666666666666657" height="26"/>
+                                        <rect key="frame" x="178" y="195.99999999999994" width="34.333333333333343" height="16.333333333333343"/>
                                         <color key="backgroundColor" name="grey100"/>
                                         <fontDescription key="fontDescription" name="Pretendard-Medium" family="Pretendard" pointSize="14"/>
                                         <color key="textColor" name="grey700"/>
@@ -703,7 +703,7 @@
                                         </userDefinedRuntimeAttributes>
                                     </label>
                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="CH7-FT-9aY">
-                                        <rect key="frame" x="221" y="166" width="20" height="20"/>
+                                        <rect key="frame" x="221" y="165.99999999999994" width="20" height="20"/>
                                         <constraints>
                                             <constraint firstAttribute="width" constant="20" id="YLt-FW-D5E"/>
                                             <constraint firstAttribute="height" constant="20" id="hTA-eL-qTc"/>
@@ -718,6 +718,7 @@
                                     <constraint firstItem="I3T-es-uVz" firstAttribute="centerX" secondItem="2tU-tH-q3K" secondAttribute="centerX" id="Krh-ns-6KE"/>
                                     <constraint firstItem="BmU-qZ-2dX" firstAttribute="centerX" secondItem="2tU-tH-q3K" secondAttribute="centerX" id="Mez-4j-aIK"/>
                                     <constraint firstItem="I3T-es-uVz" firstAttribute="top" secondItem="BmU-qZ-2dX" secondAttribute="bottom" constant="32" id="Msd-C3-2eP"/>
+                                    <constraint firstAttribute="bottom" secondItem="S0r-5G-CQ0" secondAttribute="bottom" constant="34" id="R09-W3-mm8"/>
                                     <constraint firstItem="F91-Km-a1f" firstAttribute="centerX" secondItem="2tU-tH-q3K" secondAttribute="centerX" id="Sfq-4a-1rz"/>
                                     <constraint firstItem="S0r-5G-CQ0" firstAttribute="leading" secondItem="2tU-tH-q3K" secondAttribute="leading" constant="24" id="Xr1-cq-6zo"/>
                                     <constraint firstAttribute="trailing" secondItem="S0r-5G-CQ0" secondAttribute="trailing" constant="24" id="bmL-ij-Qr4"/>
@@ -729,7 +730,7 @@
                                 </constraints>
                             </view>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Qpm-8P-7Sg">
-                                <rect key="frame" x="0.0" y="47" width="390" height="453"/>
+                                <rect key="frame" x="0.0" y="47.000000000000028" width="390" height="462.66666666666674"/>
                                 <color key="backgroundColor" white="1" alpha="0.01" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
                         </subviews>
@@ -742,7 +743,6 @@
                             <constraint firstAttribute="bottom" secondItem="2tU-tH-q3K" secondAttribute="bottom" id="Nvs-jy-KE5"/>
                             <constraint firstItem="2tU-tH-q3K" firstAttribute="centerX" secondItem="OwB-ve-8Ls" secondAttribute="centerX" id="OZa-Hi-wgf"/>
                             <constraint firstItem="2tU-tH-q3K" firstAttribute="top" secondItem="Qpm-8P-7Sg" secondAttribute="bottom" id="QL8-cx-e0U"/>
-                            <constraint firstItem="2tU-tH-q3K" firstAttribute="bottom" secondItem="S0r-5G-CQ0" secondAttribute="bottom" constant="34" id="R09-W3-mm8"/>
                             <constraint firstItem="Qpm-8P-7Sg" firstAttribute="top" secondItem="CGP-hw-9Om" secondAttribute="top" id="T8M-RC-ReS"/>
                             <constraint firstItem="CGP-hw-9Om" firstAttribute="trailing" secondItem="2tU-tH-q3K" secondAttribute="trailing" id="kPK-52-3j3"/>
                             <constraint firstItem="Qpm-8P-7Sg" firstAttribute="leading" secondItem="CGP-hw-9Om" secondAttribute="leading" id="v3J-fL-0yP"/>
@@ -886,10 +886,10 @@
     </scenes>
     <designables>
         <designable name="F91-Km-a1f">
-            <size key="intrinsicContentSize" width="58.666666666666664" height="26"/>
+            <size key="intrinsicContentSize" width="34.333333333333336" height="16.333333333333332"/>
         </designable>
         <designable name="HJZ-Dr-si8">
-            <size key="intrinsicContentSize" width="40" height="40"/>
+            <size key="intrinsicContentSize" width="28" height="28"/>
         </designable>
     </designables>
     <inferredMetricsTieBreakers>

diff --git a/ios/Extension/Utils.swift b/ios/Extension/Utils.swift
@@ -26,3 +26,17 @@ extension Date {
     return dateFormatter.date(from: string)
   }
 }
+
+extension URL {
+  func resolve(_ relativePath: String?) -> String {
+    if let path = relativePath {
+      if path.starts(with: "http://") || path.starts(with: "https://") {
+        return path
+      }
+      if path.starts(with: "//") {
+        return (self.scheme ?? "http") + ":" + path
+      }
+    }
+    return ""
+  }
+}
diff --git a/ios/Extension/ViewController/ShareViewController.swift b/ios/Extension/ViewController/ShareViewController.swift
@@ -128,7 +128,7 @@ class ShareViewController: UIViewController {
     let safeTitle = String(htmlEncodedString: rawTitle) ?? ""
 
     self.titleText = Data(safeTitle.utf8).base64EncodedString()
-    self.linkImageUrl = (og[.image] ?? "")
+    self.linkImageUrl = URL(string: link)?.resolve(og[.image])
     UserDefaultsHelper.saveLinkWithoutFolder(link, self.linkImageUrl, self.titleText)
   }
 

diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '15.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.