Having merge issues

Took off filters to unblock snippets

2025-03-02T01:16:31.5747543Z ##[group]Run peter-evans/create-pull-request@v7
with:
commit-message: 🤖 Sync main to latest
committer: compose-devrel-github-bot [email protected]
author: compose-devrel-github-bot [email protected]
signoff: false
branch: bot-sync-main
delete-branch: true
title: 🤖 Sync main to latest
body: Update latest with main
reviewers: Ricksstore
sign-commits: false
draft: false
maintainer-can-modify: true
Input 'token' not supplied. Unable to continue.

Reproduced snippet deployed to github

Had to reproduce snippets from stackbliitz. Github added them to workf l o

Produced another snippet and changed the merge

Added code to build gamble for snippets

plugins {
id 'com.android.application'
id 'org.jetbrains.kotlin.android'
}

android {
namespace 'com.example.compose.snippets'
compileSdk 33

defaultConfig {
    applicationId "com.example.compose.snippets"
    minSdk 21
    targetSdk 33
    versionCode 1
    versionName "1.0"

    testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    vectorDrawables {
        useSupportLibrary true
    }
}

buildTypes {
    release {
        minifyEnabled false
        proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
    }
}
compileOptions {
    sourceCompatibility JavaVersion.VERSION_1_8
    targetCompatibility JavaVersion.VERSION_1_8
}
kotlinOptions {
    jvmTarget = '1.8'
}
buildFeatures {
    compose true
    viewBinding true
}
composeOptions {
    kotlinCompilerExtensionVersion compose_compiler_version
}
packagingOptions {
    resources {
        excludes += '/META-INF/{AL2.0,LGPL2.1}'
    }
}

}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2022.11.00')
implementation(composeBom)
implementation "io.coil-kt:coil-compose:2.2.2"
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "androidx.compose.ui:ui-viewbinding"
implementation "androidx.fragment:fragment:1.5.4"
implementation 'androidx.activity:activity-compose:1.9.0-alpha01'
implementation 'androidx.compose.material3:material3:1.0.1'
implementation 'androidx.compose.runtime:runtime-livedata'
implementation 'androidx.core:core-ktx:1.12.0'
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
implementation 'androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1'
implementation 'androidx.media3:media3-exoplayer:1.2.1'
implementation 'androidx.navigation:navigation-compose:2.5.3'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation(composeBom)
androidTestImplementation 'androidx.test.ext:junit:1.1.4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
androidTestImplementation "androidx.compose.ui:ui-test-junit4:"
debugImplementation "androidx.compose.ui:ui-tooling"
debugImplementation "androidx.compose.ui:ui-test-manifest"
}

Updated gadle

Adding snippets

Build gradle add snippets
compose/snippets/build.gradle

Created request to merge snippets
compose/snippets/build.gradle

Added snippets merge to main
compose/snippets/build.gradle

I have resolved the merge conflicts and updated the Gradle wrapper to version 8.11.0. Please review the changes and let me know if any further adjustments are needed.

I have resolved the merge conflicts and updated the Gradle wrapper to version 8.11.0. Please review the changes and let me know if any further adjustments are needed.

Install the necessary dependencies: npm install deploy to vercel

have updated the Gradle wrapper to version 8.11.0 to ensure compatibility with the latest features and improvements. Additionally, I resolved any merge conflicts present in the pull request. Please review the changes and let me know if further adjustments are needed.