Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update all dependencies (main) #351

Merged
merged 4 commits into from
Apr 24, 2023
Merged

Update all dependencies (main) #351

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e6b361
Update Kotlin Dependencies to v1.8.20
renovate[bot] Mar 31, 2023
6cc2231
Update all dependencies
renovate[bot] Apr 19, 2023
dc1106f
Merge remote-tracking branch 'origin/renovate/main-kotlin-dependencie…
JolandaVerhoef Apr 21, 2023
b36a08d
[Main] Update JDK
JolandaVerhoef Apr 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
[Main] Update JDK
  • Loading branch information
@JolandaVerhoef
JolandaVerhoef committed Apr 21, 2023
commit b36a08d735d58d58d40684a872136dba9827d249
4 changes: 2 additions & 2 deletions .github/workflows/AccessibilityCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/AdvancedStateAndSideEffectsCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down Expand Up @@ -75,11 +75,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/AnimationCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +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
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicLayoutsCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +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
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicStateCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +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
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/BasicsCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +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
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/MigrationCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down Expand Up @@ -75,11 +75,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/NavigationCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/TestingCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ jobs:
- 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:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ThemingCodelab.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +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
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: 11
java-version: 17

- name: Generate cache key
run: ./scripts/checksum.sh $SAMPLE_PATH checksum.txt
Expand Down
1 change: 1 addition & 0 deletions AccessibilityCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace 'com.example.jetnews'
compileSdkVersion 33
defaultConfig {
applicationId 'com.example.jetnews'
Expand Down
3 changes: 1 addition & 2 deletions AccessibilityCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.jetnews">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:name=".JetnewsApplication"
Expand Down
1 change: 1 addition & 0 deletions AdaptiveUICodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace 'com.example.reply'
compileSdk 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions AdaptiveUICodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.example.reply">
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
Expand Down
1 change: 1 addition & 0 deletions AdvancedStateAndSideEffectsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ if (rootProject.file("local.properties").exists()) {
}

android {
namespace "androidx.compose.samples.crane"
compileSdkVersion 33
defaultConfig {
applicationId "androidx.compose.samples.crane"
Expand Down
3 changes: 1 addition & 2 deletions AdvancedStateAndSideEffectsCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
~ limitations under the License.
~
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="androidx.compose.samples.crane">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<uses-permission android:name="android.permission.INTERNET" />

Expand Down
1 change: 1 addition & 0 deletions AnimationCodelab/finished/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.example.android.codelab.animation"
compileSdkVersion 33
defaultConfig {
applicationId 'com.example.android.codelab.animation'
Expand Down
3 changes: 1 addition & 2 deletions AnimationCodelab/finished/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.codelab.animation">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="false"
Expand Down
1 change: 1 addition & 0 deletions AnimationCodelab/start/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.example.android.codelab.animation"
compileSdkVersion 33
defaultConfig {
applicationId 'com.example.android.codelab.animation'
Expand Down
3 changes: 1 addition & 2 deletions AnimationCodelab/start/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.android.codelab.animation">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="false"
Expand Down
1 change: 1 addition & 0 deletions BasicLayoutsCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.codelab.basiclayouts"
compileSdk 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions BasicLayoutsCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,7 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.codelab.basiclayouts">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
1 change: 1 addition & 0 deletions BasicStateCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ plugins {
}

android {
namespace "com.codelabs.state"
compileSdk 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions BasicStateCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.codelabs.state">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
6 changes: 3 additions & 3 deletions MigrationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = "11"
jvmTarget = "17"
freeCompilerArgs = ['-Xjvm-default=all-compatibility']
}
buildFeatures {
Expand Down
1 change: 1 addition & 0 deletions NavigationCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.example.compose.rally"
compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions NavigationCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.compose.rally">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
1 change: 1 addition & 0 deletions TestingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.example.compose.rally"
compileSdkVersion 33

defaultConfig {
Expand Down
3 changes: 1 addition & 2 deletions TestingCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
~ limitations under the License.
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.compose.rally">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down
1 change: 1 addition & 0 deletions ThemingCodelab/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ plugins {
}

android {
namespace "com.codelab.theming"
compileSdkVersion 33
defaultConfig {
applicationId 'com.codelab.theming'
Expand Down
3 changes: 1 addition & 2 deletions ThemingCodelab/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
or implied. See the License for the specific language governing permissions and limitations under
the License.
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.codelab.theming">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">

<application
android:allowBackup="true"
Expand Down