Merge remote-tracking branch 'goog/main'

Change-Id: Ica5052cd4b847fad499e33a4bd9f874cd0bc47b9
android · May 10, 2023 · 7a2de83 · 7a2de83
2 parents ee454d3 + 4d48775
commit 7a2de83
Show file tree

Hide file tree

Showing 91 changed files with 644 additions and 425 deletions.
diff --git a/.github/workflows/Crane.yaml b/.github/workflows/Crane.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Crane
       path: Crane
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

diff --git a/.github/workflows/JetLagged.yaml b/.github/workflows/JetLagged.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: JetLagged
       path: JetLagged
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

diff --git a/.github/workflows/JetNews.yaml b/.github/workflows/JetNews.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: JetNews
       path: JetNews
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Jetcaster
       path: Jetcaster
diff --git a/.github/workflows/Jetchat.yaml b/.github/workflows/Jetchat.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Jetchat
       path: Jetchat
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

diff --git a/.github/workflows/Jetsnack.yaml b/.github/workflows/Jetsnack.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Jetsnack
       path: Jetsnack
diff --git a/.github/workflows/Jetsurvey.yaml b/.github/workflows/Jetsurvey.yaml
@@ -15,7 +15,7 @@ on:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Jetsurvey
       path: Jetsurvey
diff --git a/.github/workflows/Owl.yaml b/.github/workflows/Owl.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Owl
       path: Owl
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -17,10 +17,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Build all projects
         run: ./scripts/gradlew_recursive.sh assembleDebug

diff --git a/.github/workflows/Reply.yaml b/.github/workflows/Reply.yaml
@@ -18,7 +18,7 @@ env:
 
 jobs:
   build:
-    uses: android/compose-samples/.github/workflows/build-sample.yml@main
+    uses: ./.github/workflows/build-sample.yml
     with:
       name: Reply
       path: Reply
@@ -38,10 +38,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
@@ -68,4 +69,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: test-reports-reply-${{ matrix.api-level }}
-          path: ${{ env.SAMPLE_PATH }}/app/build/reports
+          path: ${{ env.SAMPLE_PATH }}/app/build/reports
diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml
@@ -25,10 +25,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Generate cache key
         run: ./scripts/checksum.sh ${{ inputs.path }} checksum.txt

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -27,11 +27,11 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: set up Java 11
-      uses: actions/setup-java@v2
+    - name: set up Java 17
+      uses: actions/setup-java@v3
       with:
-        distribution: 'adopt'
-        java-version: '11'
+        distribution: 'zulu'
+        java-version: 17
 
     - name: Apply spotless formatting
       run: ./scripts/format.sh

diff --git a/.github/workflows/test-snapshot.yml b/.github/workflows/test-snapshot.yml
@@ -25,10 +25,11 @@ jobs:
       - name: Copy CI gradle.properties
         run: mkdir -p ~/.gradle ; cp .github/ci-gradle.properties ~/.gradle/gradle.properties
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
         with:
-          java-version: 11
+          java-version: 17
+          distribution: 'zulu'
 
       - name: Check snapshot
         working-directory: ${{ inputs.path }}

diff --git a/.github/workflows/update_deps.yml b/.github/workflows/update_deps.yml
@@ -10,11 +10,11 @@ jobs:
     - 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 11
+    - name: set up JDK 17
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
-        distribution: 'temurin'
+        java-version: 17
+        distribution: 'zulu'
         cache: gradle
 
     - name: Update dependencies

diff --git a/Crane/README.md b/Crane/README.md
@@ -64,7 +64,7 @@ it is always scoped to the host Activity or Fragment. This means that calling `v
 different factories in the same host Activity/Fragment don't have the desired effect; the _first_
 factory will be always used.
 
-This is the case of the [DetailsViewModel](detailsViewModel), which takes the name of
+This is the case of the [DetailsViewModel](/app/src/main/java/androidx/compose/samples/crane/details/DetailsViewModel.kt), which takes the name of
 a `City` as a parameter to load the required information for the screen. However, the above isn't a
 problem in this sample, since `DetailsScreen` is always used in it's own newly launched Activity.
 

diff --git a/Crane/app/build.gradle.kts b/Crane/app/build.gradle.kts
@@ -16,7 +16,6 @@
 * limitations under the License.
 */
 
-@Suppress("DSL_SCOPE_VIOLATION") // TODO: Remove when updating to Gradle 8.1 (https://github.com/gradle/gradle/issues/22797)
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
@@ -27,6 +26,7 @@ plugins {
 
 android {
     compileSdk = libs.versions.compileSdk.get().toInt()
+    namespace = "androidx.compose.samples.crane"
 
     defaultConfig {
         applicationId = "androidx.compose.samples.crane"
@@ -79,20 +79,20 @@ android {
     compileOptions {
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     buildFeatures {
         compose = true
-
+        buildConfig = true
     }
 
     composeOptions {
         kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
     }
 
-    packagingOptions {
+    packaging.resources {
         // Multiple dependency bring these files in. Exclude them to enable
         // our test APK to build (has no effect on our AARs)
         excludes += "/META-INF/AL2.0"

diff --git a/Crane/app/proguard-rules.pro b/Crane/app/proguard-rules.pro
@@ -22,3 +22,14 @@
 
 # Repackage classes into the top-level.
 -repackageclasses
+
+# This is generated automatically by the Android Gradle plugin.
+-dontwarn org.bouncycastle.jsse.BCSSLParameters
+-dontwarn org.bouncycastle.jsse.BCSSLSocket
+-dontwarn org.bouncycastle.jsse.provider.BouncyCastleJsseProvider
+-dontwarn org.conscrypt.Conscrypt$Version
+-dontwarn org.conscrypt.Conscrypt
+-dontwarn org.conscrypt.ConscryptHostnameVerifier
+-dontwarn org.openjsse.javax.net.ssl.SSLParameters
+-dontwarn org.openjsse.javax.net.ssl.SSLSocket
+-dontwarn org.openjsse.net.ssl.OpenJSSE
diff --git a/Crane/app/src/androidTest/AndroidManifest.xml b/Crane/app/src/androidTest/AndroidManifest.xml
@@ -16,8 +16,7 @@
   -->
 <!-- Added as workaround for https://github.com/android/android-test/issues/1412 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.compose.samples.crane">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application>
 

diff --git a/Crane/app/src/main/AndroidManifest.xml b/Crane/app/src/main/AndroidManifest.xml
@@ -16,8 +16,7 @@
   ~
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="androidx.compose.samples.crane">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <!--
@@ -59,4 +58,4 @@
             android:exported="false" />
     </application>
 
-</manifest>
+</manifest>