Merge pull request #309 from joeloewi7178/development

Development
joeloewi7178 · Dec 22, 2023 · 803947c · 803947c
2 parents 158de8d + 8bddd9c
commit 803947c
Show file tree

Hide file tree

Showing 350 changed files with 7,105 additions and 21,138 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -18,6 +18,7 @@ jobs:
   build:
     # The type of runner that the job will run on
     runs-on: macos-latest
+    timeout-minutes: 120
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -30,6 +31,9 @@ jobs:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '17'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -43,31 +47,13 @@ jobs:
           fileDir: './'
           encodedString: ${{ secrets.SIGNING_KEY }}
 
-      - name: Generate baseline profile
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: 33
-          avd-name: baselineProfGenerator
-          target: google_apis
-          arch: x86_64
-          emulator-build: 9322596
-          script: ./gradlew :benchmark:connectedBenchmarkAndroidTest -P android.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
-
-      - name: Move generated baseline profile to target folder
-        run: mv -f './benchmark/build/outputs/connected_android_test_additional_output/benchmark/connected/baselineProfGenerator(AVD) - 13/BaselineProfileGenerator_generate-baseline-prof.txt' ./app/src/main/baseline-prof.txt
-
-      - name: Check baseline-prof file status
-        run: stat ./app/src/main/baseline-prof.txt
-
-      - name: View some lines of baseline-prof file
-        run: head ./app/src/main/baseline-prof.txt
-
-      - name: Build with Gradle
-        run: ./gradlew assemble
-
-      - name: Build Release AAB
-        id: buildRelease
-        run: ./gradlew bundleRelease
+      - name: Build release variant including baseline profile generation
+        run: ./gradlew :app:assembleRelease
+          -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.experimental.androidTest.numManagedDeviceShards=1
+          -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
 
       - name: Upload Android Release to Play Store
         uses: r0adkll/upload-google-play@v1
@@ -78,4 +64,4 @@ jobs:
           track: internal
           status: completed
           inAppUpdatePriority: 5
-          mappingFile: app/build/outputs/mapping/release/mapping.txt
+          mappingFile: app/build/outputs/mapping/release/mapping.txt
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
@@ -1,19 +1,24 @@
 # This is a basic workflow to help you get started with Actions
-
-name: Build
+name: OnPullRequest
 
 # Controls when the workflow will run
 on:
   # Triggers the workflow on push or pull request events but only for the "master" branch
   pull_request:
-    branches: [ "master" ]
+    branches: [ master ]
+
+env:
+  ALIAS: ${{ secrets.ALIAS }}
+  KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
+  KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
   # This workflow contains a single job called "build"
   build:
     # The type of runner that the job will run on
-    runs-on: ubuntu-latest
+    runs-on: macos-latest
+    timeout-minutes: 120
 
     # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
@@ -26,6 +31,9 @@ jobs:
           distribution: 'zulu' # See 'Supported distributions' for available options
           java-version: '17'
 
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v3
+
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
@@ -39,9 +47,10 @@ jobs:
           fileDir: './'
           encodedString: ${{ secrets.SIGNING_KEY }}
 
-      - name: Build with Gradle
-        run: ./gradlew clean build --no-daemon --parallel build
-        env:
-          ALIAS: ${{ secrets.ALIAS }}
-          KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
-          KEY_STORE_PASSWORD: ${{ secrets.KEY_STORE_PASSWORD }}
+      - name: Build release variant including baseline profile generation
+        run: ./gradlew :app:assembleRelease
+          -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile
+          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect"
+          -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
+          -Pandroid.experimental.androidTest.numManagedDeviceShards=1
+          -Pandroid.experimental.testOptions.managedDevices.maxConcurrentDevices=1
diff --git a/.gitignore b/.gitignore
@@ -78,7 +78,7 @@ captures/
 *.keystore
 
 # Google Services (e.g. APIs or Firebase)
-google-services.json
+# google-services.json
 
 # Android Patch
 gen-external-apklibs

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/README.md b/README.md
@@ -19,9 +19,3 @@ An android app that can attend HoYoLAB check-in events automatically
 
 - Clean Architecture
 - MVVM
-
-# Before Build & Run
-
-This project uses firebase and not contains *google-services.json* file because it's a server key.
-There will be errors if you only cloned and run it, so you have to get *google-services.json* from
-your own firebase project and put in to cloned project directory.
diff --git a/app/baseline-profiles-rules.pro b/app/baseline-profiles-rules.pro
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -1,12 +1,12 @@
 @Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id("croissant.android.application")
-    id("croissant.android.application.compose")
-    id("croissant.android.hilt")
-    alias(libs.plugins.gms.google.services)
+    alias(libs.plugins.croissant.android.application)
+    alias(libs.plugins.croissant.android.application.compose)
+    alias(libs.plugins.croissant.android.hilt)
+    alias(libs.plugins.croissant.android.application.firebase)
     id("kotlin-parcelize")
-    alias(libs.plugins.firebase.crashlytics)
     id("com.google.android.gms.oss-licenses-plugin")
+    alias(libs.plugins.androidx.baselineprofile)
 }
 
 kotlin {
@@ -20,8 +20,9 @@ android {
 
     defaultConfig {
         applicationId = "com.joeloewi.croissant"
-        versionCode = 41
-        versionName = "1.2.0"
+        versionCode = 42
+        versionName = "1.2.1"
+        targetSdk = 34
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -50,24 +51,27 @@ android {
             )
             signingConfig = signingConfigs.getByName("release")
         }
-        val benchmark by creating {
-            initWith(release)
-            signingConfig = signingConfigs.getByName("release")
-            matchingFallbacks += listOf("release")
-            isDebuggable = false
-            proguardFiles("baseline-profiles-rules.pro")
-        }
     }
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
+    buildFeatures {
+        buildConfig = true
+    }
+}
+
+baselineProfile {
+    // Don't build on every iteration of a full assemble.
+    // Instead enable generation directly for the release build variant.
+    automaticGenerationDuringBuild = false
 }
 
 dependencies {
     implementation(project(":data"))
     implementation(project(":domain"))
+    baselineProfile(project(":baselineprofile"))
 
     implementation(libs.androidx.core.ktx)
     implementation(libs.android.material)
@@ -90,7 +94,6 @@ dependencies {
 
     //hilt-extension
     implementation(libs.hilt.ext.work)
-    kapt(libs.hilt.ext.compiler)
 
     //compose
     implementation(libs.androidx.compose.foundation)
@@ -99,6 +102,7 @@ dependencies {
     implementation(libs.androidx.compose.ui.tooling.preview)
     implementation(libs.androidx.compose.runtime.livedata)
     implementation(libs.androidx.compose.material.iconsExtended)
+    implementation(libs.androidx.compose.ui.util)
     debugImplementation(libs.androidx.compose.ui.tooling)
 
     //accompanist
@@ -140,11 +144,6 @@ dependencies {
     //in-app review
     implementation(libs.android.play.review.ktx)
 
-    //firebase
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.analytics.ktx)
-    implementation(libs.firebase.crashlytics.ktx)
-
     //leakCanary
     debugImplementation(libs.leakcanary.android)
 
@@ -158,8 +157,4 @@ dependencies {
 
     //open source license activity
     implementation(libs.gms.play.services.oss.licenses)
-}
-
-hilt {
-    enableAggregatingTask = true
 }
diff --git a/app/google-services.json b/app/google-services.json
@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "YourProjectId",
+    "project_id": "abc",
+    "storage_bucket": "abc"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "Your:App:Id",
+        "android_client_info": {
+          "package_name": "com.joeloewi.croissant"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "APlaceholderAPIKeyWith-ThirtyNineCharsX"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/...oewi/croissant/ExampleInstrumentedTest.kt → ...oewi/croissant/ExampleInstrumentedTest.kt b/...oewi/croissant/ExampleInstrumentedTest.kt → ...oewi/croissant/ExampleInstrumentedTest.kt
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,19 +11,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
-
-    <uses-permission
-        android:name="android.permission.READ_PHONE_STATE"
-        tools:node="remove" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        tools:node="remove"
-        android:maxSdkVersion="32" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32"
-        tools:ignore="ScopedStorage"
-        tools:node="remove" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
 
     <queries>
         <intent>
@@ -77,6 +65,7 @@
             android:authorities="${applicationId}.androidx-startup"
             android:exported="false"
             tools:node="merge">
+
             <!-- in android 13, creating notification channel request post_notifications permission -->
             <!-- so disable auto initializing -->
             <meta-data
@@ -91,12 +80,6 @@
             <meta-data
                 android:name="com.joeloewi.croissant.initializer.CoilInitializer"
                 android:value="androidx.startup" />
-            <meta-data
-                android:name="com.joeloewi.croissant.initializer.ComposeViewInitializer"
-                android:value="androidx.startup" />
-            <meta-data
-                android:name="com.joeloewi.croissant.initializer.FirebaseAnalyticsInitializer"
-                android:value="androidx.startup" />
             <meta-data
                 android:name="androidx.work.WorkManagerInitializer"
                 android:value="androidx.startup"
@@ -145,6 +128,10 @@
         <service
             android:name=".service.RemoteViewsFactoryService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
+        <service
+            android:name="androidx.work.impl.foreground.SystemForegroundService"
+            android:foregroundServiceType="dataSync"
+            tools:node="merge" />
 
         <activity
             android:name=".MainActivity"