Merge branch 'main' into patch-2

Author: mmoczkowski

.editorconfig

@@ -0,0 +1,6 @@
+# https://editorconfig.org/
+# This configuration is used by ktlint when spotless invokes it
+
+[*.{kt,kts}]
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true

.github/workflows/AndroidCIWithGmd.yaml

@@ -0,0 +1,38 @@
+name: Android CI with GMD
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+
+  android-ci:
+    runs-on: macos-12
+    strategy:
+      matrix:
+        device-config: [ "pixel4api30aospatd", "pixelcapi30aospatd" ]
+
+    steps:
+      - uses: actions/setup-java@v3
+        with:
+          distribution: 'zulu'
+          java-version: '11'
+      - uses: actions/checkout@v3
+
+      - name: Setup Android SDK
+        uses: android-actions/setup-android@v2
+
+      - name: Run instrumented tests with GMD
+        run: ./gradlew cleanManagedDevices --unused-only &&
+          ./gradlew ${{ matrix.device-config }}DemoDebugAndroidTest -Dorg.gradle.workers.max=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
+          path: |
+            '**/*/build/reports/androidTests/'

.github/workflows/Build.yaml

@@ -90,7 +90,7 @@ jobs:
           disable-animations: true
           disk-size: 6000M
           heap-size: 600M
-          script: ./gradlew connectedProdDebugAndroidTest -x :benchmark:connectedProdBenchmarkAndroidTest
+          script: ./gradlew connectedDemoDebugAndroidTest -x :benchmark:connectedDemoBenchmarkAndroidTest
 
       - name: Upload test reports
         if: always()

.google/BUILDME

@@ -0,0 +1,2 @@
+# This file can be used to trigger an internal build by changing the number below
+3

.idea/codeStyles/Project.xml

@@ -16,22 +16,27 @@
 -->
 <component name="ProjectRunConfigurationManager">
   <!--
-  Baseline Profiles improve code execution speed by around 30% from the first launch by avoiding interpretation and just-in-time (JIT) compilation steps for included code paths.
+  Baseline Profiles improve code execution speed by around 30% from the first launch by avoiding
+  interpretation and just-in-time (JIT) compilation steps for included code paths.
   More information at http://d.android.com/baseline-profiles.
+
+  In this run configuration we leverage rerun parameter that always reruns the requested task regardless of cache.
+  We also leverage enable-display parameter to be able to verify the generator works as intended.
   -->
   <configuration default="false" name="Generate Demo Baseline Profile" type="GradleRunConfiguration" factoryName="Gradle">
     <ExternalSystemSettings>
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <!-- TODO Once we use Gradle wrapper 7.6, we can use rerun instead of rerun-tasks that will skip cache only for one task -->
-      <option name="scriptParameters" value="--rerun-tasks -Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
+      <option name="scriptParameters" value="-Pandroid.testInstrumentationRunnerArguments.androidx.benchmark.enabledRules=BaselineProfile" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
-          <option value=":benchmark:pixel6Api31DemoBenchmarkAndroidTest" />
+          <option value=":benchmark:pixel6Api31atdDemoBenchmarkAndroidTest" />
+          <option value="--rerun" />
+          <option value="--enable-display" />
         </list>
       </option>
       <option name="vmOptions" />

.run/Generate Demo Baseline Profile.run.xml

@@ -22,17 +22,23 @@ The app is currently in development. The `demoRelease` variant is [available on
 **Now in Android** displays content from the
 [Now in Android](https://developer.android.com/series/now-in-android) series. Users can browse for
 links to recent videos, articles and other content. Users can also follow topics they are interested
-in or follow specific authors.
+in.
 
 ## Screenshots
 
 ![Screenshot showing For You screen, Interests screen and Topic detail screen](docs/images/screenshots.png "Screenshot showing For You screen, Interests screen and Topic detail screen")
 
 # Development Environment
 
-**Now in Android** uses the Gradle build system and can be imported directly into the latest stable
-version of Android Studio (available [here](https://developer.android.com/studio)). The `debug`
-build can be built and run using the default configuration.
+**Now in Android** uses the Gradle build system and can be imported directly into Android Studio (make sure you are using the latest stable version available [here](https://developer.android.com/studio)). 
+
+Change the run configuration to `app`.
+
+![image](https://user-images.githubusercontent.com/873212/210559920-ef4a40c5-c8e0-478b-bb00-4879a8cf184a.png)
+
+The `demoDebug` and `demoRelease` build variants can be built and run (the `prod` variants use a backend server which is not currently publicly available).
+
+![image](https://user-images.githubusercontent.com/873212/210560507-44045dc5-b6d5-41ca-9746-f0f7acf22f8e.png)
 
 Once you're up and running, you can refer to the learning journeys below to get a better
 understanding of which libraries and tools are being used, the reasoning behind the approaches to

README.md

@@ -1,3 +1,21 @@
+/*
+ * Copyright 2022 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
+ *
+ *     https://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.
+ */
+import com.google.samples.apps.nowinandroid.FlavorDimension
+import com.google.samples.apps.nowinandroid.NiaFlavor
+
 /*
  * Copyright 2022 The Android Open Source Project
  *
@@ -21,10 +39,12 @@ plugins {
 android {
     defaultConfig {
         applicationId = "com.google.samples.apps.niacatalog"
+        versionCode = 1
+        versionName = "0.0.1" // X.Y.Z; X = Major, Y = minor, Z = Patch level
 
         // The UI catalog does not depend on content from the app, however, it depends on modules
         // which do, so we must specify a default value for the contentType dimension.
-        missingDimensionStrategy("contentType", "demo")
+        missingDimensionStrategy(FlavorDimension.contentType.name, NiaFlavor.demo.name)
     }
 
     packagingOptions {
@@ -33,12 +53,20 @@ android {
         }
     }
     namespace = "com.google.samples.apps.niacatalog"
+
+    buildTypes {
+        val release by getting {
+            // To publish on the Play store a private signing key is required, but to allow anyone
+            // who clones the code to sign and run the release variant, use the debug signing key.
+            // TODO: Abstract the signing configuration to a separate file to avoid hardcoding this.
+            signingConfig = signingConfigs.getByName("debug")
+        }
+    }
 }
 
 dependencies {
-    implementation(project(":core:ui"))
     implementation(project(":core:designsystem"))
-
-    implementation(libs.androidx.activity.compose)
+    implementation(project(":core:ui"))
     implementation(libs.accompanist.flowlayout)
-}
+    implementation(libs.androidx.activity.compose)
+}