From 565f1d70bc4814f2b75474aa7e939b890cd9e239 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Tue, 6 Aug 2024 09:28:05 -0700 Subject: [PATCH 1/2] UPDATE_KOTLIN_VERSION: 2.0.10 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3c45b69ef8..6b935924d0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ # Copied from kotlinc org.gradle.jvmargs=-Duser.country=US -Dkotlin.daemon.jvm.options=-Xmx4096m -Dfile.encoding=UTF-8 -kotlinBaseVersion=2.0.10-RC2 +kotlinBaseVersion=2.0.10 agpBaseVersion=7.2.0 intellijVersion=213.7172.25 junitVersion=4.13.1 From 831a2d5fb566fdabbc8b997c22bff4bb47c082d4 Mon Sep 17 00:00:00 2001 From: Ting-Yuan Huang Date: Tue, 6 Aug 2024 09:34:15 -0700 Subject: [PATCH 2/2] Update CI to build for dedicated release branch --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 92dc017eec..1ed2de2cd9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -4,11 +4,11 @@ name: CI on: push: - branches: [ main, 1.0.24-release, 1.0.23-release ] + branches: [ 1.0.24-release-2.0.10 ] pull_request: - branches: [ main, 1.0.24-release, 1.0.23-release ] + branches: [ 1.0.24-release-2.0.10 ] workflow_dispatch: - branches: [ main, 1.0.24-release, 1.0.23-release ] + branches: [ 1.0.24-release-2.0.10 ] jobs: build-and-test: