Skip to content

Commit

Permalink
Update all dependencies (end) (#358)
Browse files Browse the repository at this point in the history
* Update all dependencies

* Revert compiler deps update

* Add namespace for Theming codelab

* Add missing workflow yamls

* retrigger checks

* Update kotlin deps for Theming

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Simona Stojanovic <[email protected]>
  • Loading branch information
renovate[bot] and simona-anomis authored May 11, 2023
1 parent 72190c3 commit 62ca492
Show file tree
Hide file tree
Showing 19 changed files with 513 additions and 163 deletions.
60 changes: 60 additions & 0 deletions .github/workflows/AnimationCodelab.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: AnimationCodelab

on:
push:
branches:
- main
paths:
- 'AnimationCodelab/**'
pull_request:
paths:
- 'AnimationCodelab/**'

env:
SAMPLE_PATH: AnimationCodelab

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 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: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
60 changes: 60 additions & 0 deletions .github/workflows/BasicLayoutsCodelab.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: BasicLayoutsCodelab

on:
push:
branches:
- main
paths:
- 'BasicLayoutsCodelab/**'
pull_request:
paths:
- 'BasicLayoutsCodelab/**'

env:
SAMPLE_PATH: BasicLayoutsCodelab

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 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: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
60 changes: 60 additions & 0 deletions .github/workflows/BasicStateCodelab.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: BasicStateCodelab

on:
push:
branches:
- main
paths:
- 'BasicStateCodelab/**'
pull_request:
paths:
- 'BasicStateCodelab/**'

env:
SAMPLE_PATH: BasicStateCodelab

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 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: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
60 changes: 60 additions & 0 deletions .github/workflows/BasicsCodelab.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: BasicsCodelab

on:
push:
branches:
- main
paths:
- 'BasicsCodelab/**'
pull_request:
paths:
- 'BasicsCodelab/**'

env:
SAMPLE_PATH: BasicsCodelab

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 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: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
60 changes: 60 additions & 0 deletions .github/workflows/ThemingCodelab.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: ThemingCodelab

on:
push:
branches:
- main
paths:
- 'ThemingCodelab/**'
pull_request:
paths:
- 'ThemingCodelab/**'

env:
SAMPLE_PATH: ThemingCodelab

jobs:
build:
runs-on: ubuntu-latest
timeout-minutes: 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: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt

- uses: actions/cache@v3
with:
path: |
~/.gradle/caches/modules-*
~/.gradle/caches/jars-*
~/.gradle/caches/build-cache-*
key: gradle-${{ hashFiles('checksum.txt') }}

- name: Build project
working-directory: ${{ env.SAMPLE_PATH }}
run: ./gradlew assembleDebug lintDebug --stacktrace

- name: Upload build outputs (APKs)
uses: actions/upload-artifact@v3
with:
name: build-outputs
path: ${{ env.SAMPLE_PATH }}/app/build/outputs

- name: Upload build reports
if: always()
uses: actions/upload-artifact@v3
with:
name: build-reports
path: ${{ env.SAMPLE_PATH }}/app/build/reports
8 changes: 4 additions & 4 deletions AccessibilityCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
testImplementation(composeBom)
androidTestImplementation(composeBom)
Expand All @@ -98,13 +98,13 @@ dependencies {
implementation "com.google.accompanist:accompanist-insets:$accompanist_version"
implementation "com.google.accompanist:accompanist-systemuicontroller:$accompanist_version"

implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"

implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'androidx.activity:activity-ktx:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.activity:activity-compose:1.7.1"

implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.1"
Expand All @@ -119,7 +119,7 @@ dependencies {

// TODO: Bump to latest after Espresso 3.5.0 goes stable
// (due to https://github.com/robolectric/robolectric/issues/6593)
testImplementation 'org.robolectric:robolectric:4.10'
testImplementation 'org.robolectric:robolectric:4.10.2'
}

tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
Expand Down
4 changes: 2 additions & 2 deletions AdaptiveUiCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ android {
dependencies {


def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)

Expand All @@ -79,7 +79,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.6.1"
implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
implementation 'androidx.activity:activity-compose:1.7.1'
implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.window:window:1.0.0"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"

Expand Down
2 changes: 1 addition & 1 deletion AdvancedStateAndSideEffectsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ dependencies {
implementation "androidx.activity:activity-compose:1.7.1"
implementation "androidx.appcompat:appcompat:1.6.1"

def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)
implementation "androidx.compose.runtime:runtime"
Expand Down
6 changes: 3 additions & 3 deletions BasicLayoutsCodelab/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@ android {
}

dependencies {
def composeBom = platform('androidx.compose:compose-bom:2023.04.01')
def composeBom = platform('androidx.compose:compose-bom:2023.05.01')
implementation(composeBom)
androidTestImplementation(composeBom)

implementation 'androidx.core:core-ktx:1.10.0'
implementation 'androidx.core:core-ktx:1.10.1'
implementation "androidx.compose.ui:ui"
implementation "androidx.compose.material:material"
implementation "androidx.compose.material:material-icons-extended"
implementation "androidx.compose.ui:ui-tooling-preview"
implementation "com.google.android.material:material:1.8.0"
implementation "com.google.android.material:material:1.9.0"
implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
implementation 'androidx.activity:activity-compose:1.7.1'
testImplementation 'junit:junit:4.13.2'
Expand Down
Loading

0 comments on commit 62ca492

Please sign in to comment.