Merge pull request #16 from NaJuDoRyeong/main

Snyc

.github/ci-gradle.properties

@@ -0,0 +1,28 @@
+#
+# Copyright 2020 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.workers.max=2
+
+kotlin.incremental=false
+kotlin.compiler.execution.strategy=in-process
+
+# Controls KotlinOptions.allWarningsAsErrors.
+# This value used in CI and is currently set to false.
+# If you want to treat warnings as errors locally, set this property to true
+# in your ~/.gradle/gradle.properties file.
+warningsAsErrors=false

.github/workflows/Build.yaml

@@ -23,7 +23,7 @@ jobs:
         uses: gradle/wrapper-validation-action@v1
 
       - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties        
+        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
       - name: Set up JDK 17
         uses: actions/setup-java@v3
@@ -34,20 +34,8 @@ jobs:
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      - name: Check spotless
-        run: ./gradlew spotlessCheck --init-script gradle/init.gradle.kts --no-configuration-cache
-
-      - name: Build all build type and flavor permutations
-        run: ./gradlew assemble
-
-      - name: Upload build outputs (APKs)
-        uses: actions/upload-artifact@v3
-        with:
-          name: APKs
-          path: '**/build/outputs/apk/**/*.apk'
-
       - name: Run local tests
-        run: ./gradlew testDemoDebug testProdDebug
+        run: ./gradlew testDemoDebug
 
   test:
     runs-on: ubuntu-latest
@@ -79,7 +67,7 @@ jobs:
       - name: Run all local screenshot tests (Roborazzi)
         id: screenshotsverify
         continue-on-error: true
-        run: ./gradlew verifyRoborazziDemoDebug
+        run: ./gradlew verifyRoborazziDemoDebug --stacktrace --info
 
       - name: Prevent pushing new screenshots if this is a fork
         id: checkfork
@@ -106,107 +94,11 @@ jobs:
       # Run local tests after screenshot tests to avoid wrong UP-TO-DATE. TODO: Ignore screenshots.
       - name: Run local tests
         if: always()
-        run: ./gradlew testDemoDebug testProdDebug
+        run: ./gradlew testDemoDebug
 
       - name: Upload test results (XML)
         if: always()
         uses: actions/upload-artifact@v3
         with:
           name: test-results
-          path: '**/build/test-results/test*UnitTest/**.xml'
-
-      - name: Check lint
-        run: ./gradlew :app:lintProdRelease :app-nia-catalog:lintRelease :lint:lint
-
-      - name: Upload lint reports (HTML)
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: lint-reports
-          path: '**/build/reports/lint-results-*.html'
-
-  androidTest:
-    needs: build
-    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
-    timeout-minutes: 55
-    strategy:
-      matrix:
-        api-level: [26, 30]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
-      - name: Build AndroidTest apps
-        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest --daemon
-
-      - name: Run instrumentation tests
-        uses: reactivecircus/android-emulator-runner@v2
-        with:
-          api-level: ${{ matrix.api-level }}
-          arch: x86_64
-          disable-animations: true
-          disk-size: 6000M
-          heap-size: 600M
-          script: ./gradlew connectedDemoDebugAndroidTest --daemon
-
-      - name: Upload test reports
-        if: always()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-reports-${{ matrix.api-level }}
-          path: '**/build/reports/androidTests'
-
-  androidTest-GMD:
-    needs: build
-    runs-on: macOS-latest # enables hardware acceleration in the virtual machine
-    timeout-minutes: 90
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Copy CI gradle.properties
-        run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
-
-      - name: Set up JDK 17
-        uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-
-      - name: Setup Gradle
-        uses: gradle/gradle-build-action@v2
-
-      - name: Accept Android licenses
-        run: yes | "$ANDROID_HOME"/cmdline-tools/latest/bin/sdkmanager --licenses || true
-
-      - name: Build AndroidTest apps
-        run: ./gradlew packageDemoDebug packageDemoDebugAndroidTest
-
-      - name: Run instrumented tests with GMD
-        run: ./gradlew ciDemoDebugAndroidTest --no-parallel --max-workers=1
-          -Pandroid.testoptions.manageddevices.emulator.gpu="swiftshader_indirect" -Pandroid.experimental.testOptions.managedDevices.emulator.showKernelLogging=true
-
-      - name: Upload test reports
-        if: success() || failure()
-        uses: actions/upload-artifact@v3
-        with:
-          name: test-reports-GMD
-          path: '**/build/reports/androidTests'
-
-      - name: Print disk space usage
-        if: failure()
-        run: df -h
+          path: '**/build/test-results/test*UnitTest/**.xml'

app/src/main/java/com/najudoryeong/mineme/ui/DoApp.kt

@@ -63,7 +63,6 @@ fun DoApp(
     )
 ) {
 
-
     Box(
         Modifier.fillMaxSize()
     ) {

app/src/testDemo/java/com/najudoryeong/mineme/ui/DoAppScreenSizesScreenshotTests.kt

@@ -89,10 +89,7 @@ class DoAppScreenSizesScreenshotTests {
     @Inject
     lateinit var networkMonitor: NetworkMonitor
 
-    @Inject
-    lateinit var userDataRepository: UserDataRepository
-
-
+    @Before
     fun setup() {
         val config = Configuration.Builder()
             .setMinimumLoggingLevel(Log.DEBUG)

build-logic/convention/build/kotlin/compileKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-27
+23
 0

core/analytics/build/kotlin/compileDemoDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-10
+5
 0

core/analytics/build/kotlin/kaptGenerateStubsDemoDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-10
+5
 0

core/analytics/build/outputs/logs/manifest-merger-demo-debug-report.txt

@@ -1,16 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml:2:13-83
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml:2:13-83
+ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml:2:13-83
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml:2:13-83
 	package
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml
 	xmlns:android
-		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml:2:23-81
+		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml:2:23-81
 uses-sdk
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml reason: use-sdk injection requested
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml reason: use-sdk injection requested
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml
 	android:targetSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml
 	android:minSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1258519773561712806.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\analytics\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest5259636980210529864.xml

core/common/build/outputs/logs/manifest-merger-demo-debug-report.txt

@@ -1,16 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml:2:13-83
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml:2:13-83
+ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml:2:13-83
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml:2:13-83
 	package
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml
 	xmlns:android
-		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml:2:23-81
+		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml:2:23-81
 uses-sdk
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml reason: use-sdk injection requested
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml reason: use-sdk injection requested
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml
 	android:targetSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml
 	android:minSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest12135539837104617664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\common\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest1474444785759347751.xml

core/data-test/build/.transforms/347e8e25c524cbd07abd05835ba88ceb/results.bin

@@ -0,0 +1 @@
+i/

core/data-test/build/.transforms/50fb9b265d8f92abf76aad280489934d/results.bin

@@ -0,0 +1 @@
+o/hiltAggregated.jar

core/data-test/build/.transforms/d899011a2829fa461823a92c89c2b34e/results.bin

@@ -0,0 +1 @@
+i/

core/data-test/build/outputs/logs/manifest-merger-demo-debug-report.txt

@@ -1,16 +1,16 @@
 -- Merging decision tree log ---
 manifest
-ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml:2:13-83
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml:2:13-83
+ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml:2:13-83
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml:2:13-83
 	package
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml
 	xmlns:android
-		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml:2:23-81
+		ADDED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml:2:23-81
 uses-sdk
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml reason: use-sdk injection requested
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml
-INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml reason: use-sdk injection requested
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml
+INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml
 	android:targetSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml
 	android:minSdkVersion
-		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest10366018529660021664.xml
+		INJECTED from C:\Users\kimdowoo\AndroidStudioProjects\mineme\core\data-test\build\intermediates\tmp\ProcessLibraryManifest\demo\debug\tempAndroidManifest17621535538589064799.xml

core/data/build/kotlin/compileDemoDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-14
+12
 0

core/data/build/kotlin/kaptGenerateStubsDemoDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-14
+12
 0