Merge remote-tracking branch 'upstream/main'

Author: wosys

.github/workflows/build.yml

@@ -42,21 +42,24 @@ jobs:
       - name: Build debug 
         run: ./gradlew assembleDebug
 
-      - name: Run local tests
-        run: ./gradlew testDebug
+      # TODO: Temporarily disable unit tests until the infra is fixed
+      # - name: Run local tests
+      #   run: ./gradlew testDebug
 
       - name: Upload build outputs (APKs)
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-outputs
           path: app/build/outputs
+          overwrite: true
 
       - name: Upload build reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: build-reports
           path: app/build/reports
+          overwrite: true
 
   androidTest:
     needs: build
@@ -112,7 +115,8 @@ jobs:
 
       - name: Upload test reports
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: test-reports-${{ matrix.api-level }}
           path: '*/build/reports/androidTests'
+          overwrite: true

.idea/kotlinc.xml

@@ -5,8 +5,7 @@
 This repository contains a collection of samples that demonstrate the use of different Android OS platform APIs. The samples are organized into folders by topic, and each folder contains a README file that provides more information about the samples in that folder.
 
 > **Note:** These samples are intended to showcase specific functionality in isolation, and they may use
-> simplified code. They are not intended to be used as production-ready code. The project uses the
-> [casa-android](https://github.com/google/casa-android) (intended only for demo projects).
+> simplified code. They are not intended to be used as production-ready code.
 > For best practices follow our documentation and check
 > [Now In Android](https://github.com/android/nowinandroid)
 
@@ -22,9 +21,7 @@ Browse the samples inside each topic samples folder:
 - [User-interface](https://github.com/android/platform-samples/tree/main/samples/user-interface)
 - More to come...
 
-We are constantly adding new samples to this repository. You can find a list of all the available samples [here](https://github.com/android/platform-samples/tree/main/samples/README.md).
-
-> 🚧 **Work-in-Progress:** we are working on bringing more existing and new samples into this format.
+We are constantly adding new samples to this repository. You can find a list of all the available samples [here](https://github.com/android/platform-samples/tree/main/samples).
 
 ## How to run
 
@@ -39,17 +36,6 @@ categories and available samples.
 > for their functionality, you can simply ignore it. The wiring is done under the hood and an
 > implementation detail not needed to understand any sample functionality.
 
-### Deeplink to sample
-
-To open a specific sample directly you can use one of the auto-generated configurations.
-
-1. Build the project at least once
-2. Open `Run Configuration` dropdown
-3. Select sample name
-4. Run
-
-> **Tip:** use `⌃⌥R` or `Alt+Shift+F10` shortcut to open the full list and launch the selected one. 
-
 ## Reporting Issues
 
 You can report an [issue with a sample](https://github.com/android/platform-samples/issues) using

README.md

@@ -13,103 +13,98 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-@Suppress("DSL_SCOPE_VIOLATION")
+
 plugins {
     alias(libs.plugins.android.application)
     alias(libs.plugins.kotlin.android)
-    alias(libs.plugins.ksp)
-    alias(libs.plugins.hilt)
-    id("com.example.platform.convention")
-}
-
-java {
-    toolchain {
-        languageVersion.set(JavaLanguageVersion.of(17))
-    }
+    alias(libs.plugins.kotlin.compose)
+    kotlin("plugin.serialization") version "2.1.10"
 }
 
 android {
-    namespace = "com.example.platform.app"
+    namespace = "com.example.platform"
     compileSdk = 35
 
     defaultConfig {
-        applicationId = "com.example.platform.app"
+        applicationId = "com.example.platform"
         minSdk = 21
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
-        testInstrumentationRunner = "com.example.platform.app.AppTestRunner"
-        vectorDrawables {
-            useSupportLibrary = true
-        }
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
     buildTypes {
         release {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro"
+                "proguard-rules.pro",
             )
         }
     }
-
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+    kotlinOptions {
+        jvmTarget = "11"
     }
-
     buildFeatures {
         compose = true
     }
-    composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get()
-    }
-    packagingOptions {
-        resources {
-            excludes += "/META-INF/{AL2.0,LGPL2.1}"
-        }
-    }
 }
 
 dependencies {
-    implementation(platform(libs.compose.bom))
-    implementation(libs.casa.ui)
-    implementation(libs.androidx.appcompat)
-
-    implementation(libs.hilt.android)
-    ksp(libs.hilt.compiler)
 
-    implementation(libs.coil.base)
-    implementation(libs.coil.video)
+    implementation(libs.androidx.core.ktx)
+    implementation(libs.androidx.lifecycle.runtime.ktx)
+    implementation(libs.androidx.activity.compose)
+    implementation(platform(libs.androidx.compose.bom))
+    implementation(libs.androidx.ui)
+    implementation(libs.androidx.ui.graphics)
+    implementation(libs.androidx.ui.tooling.preview)
+    implementation(libs.androidx.material3)
+    implementation(libs.androidx.navigation.compose)
 
-    // include all available samples.
-    val samples: List<String> by project.extra
-    samples.forEach {
-        implementation(project(it))
-    }
+    implementation(libs.kotlinx.serialization.json)
+    implementation(libs.androidx.fragment.compose)
 
-    // Testing
-    kspAndroidTest(libs.hilt.compiler)
-    androidTestImplementation(platform(libs.compose.bom))
-    androidTestImplementation(libs.androidx.navigation.testing)
-    androidTestImplementation(libs.compose.ui.test.manifest)
-    debugImplementation(libs.compose.ui.test.manifest)
-    androidTestImplementation(libs.compose.ui.test.junit4)
-    androidTestImplementation(libs.androidx.test.core)
-    androidTestImplementation(libs.androidx.test.espresso.core)
-    androidTestImplementation(libs.androidx.test.rules)
-    androidTestImplementation(libs.androidx.test.runner)
-    androidTestImplementation(libs.hilt.testing)
-    androidTestImplementation(libs.junit4)
-}
+    implementation(project(":shared"))
+    implementation(project(":samples:accessibility"))
+    implementation(project(":samples:camera:camera2"))
+    implementation(project(":samples:connectivity:audio"))
+    implementation(project(":samples:connectivity:bluetooth:ble"))
+    implementation(project(":samples:connectivity:bluetooth:companion"))
+    implementation(project(":samples:connectivity:callnotification"))
+    implementation(project(":samples:connectivity:telecom"))
+    implementation(project(":samples:graphics:pdf"))
+    implementation(project(":samples:graphics:ultrahdr"))
+    implementation(project(":samples:location"))
+    implementation(project(":samples:media:ultrahdr"))
+    implementation(project(":samples:media:video"))
+    implementation(project(":samples:privacy:data"))
+    implementation(project(":samples:privacy:permissions"))
+    implementation(project(":samples:privacy:transparency"))
+    implementation(project(":samples:storage"))
+    implementation(project(":samples:user-interface:appwidgets"))
+    implementation(project(":samples:user-interface:constraintlayout"))
+    implementation(project(":samples:user-interface:draganddrop"))
+    implementation(project(":samples:user-interface:haptics"))
+    implementation(project(":samples:user-interface:picture-in-picture"))
+    implementation(project(":samples:user-interface:predictiveback"))
+    implementation(project(":samples:user-interface:quicksettings"))
+    implementation(project(":samples:user-interface:share"))
+    implementation(project(":samples:user-interface:text"))
+    implementation(project(":samples:user-interface:window-insets"))
+    implementation(project(":samples:user-interface:windowmanager"))
 
-tasks.register("syncSamplesInfo", com.example.platform.plugin.SyncSamplesInfo::class.java) {
-    projectDir.set(project.rootDir)
-}
-// Link the assemble task to the sync task.
-// TODO: move syncSamplesInfo task here, as this can break isolated projects
-afterEvaluate {
-    tasks.findByName("assembleDebug")?.finalizedBy(tasks.findByName("syncSamplesInfo"))
-}
+    testImplementation(libs.junit)
+    androidTestImplementation(libs.androidx.junit)
+    androidTestImplementation(libs.androidx.espresso.core)
+    androidTestImplementation(platform(libs.androidx.compose.bom))
+    androidTestImplementation(libs.androidx.ui.test.junit4)
+    debugImplementation(libs.androidx.ui.tooling)
+    debugImplementation(libs.androidx.ui.test.manifest)
+}