From b5fee08b563cbf53758d2ee23510871b6b9187cd Mon Sep 17 00:00:00 2001 From: qiaoyuang Date: Tue, 30 Apr 2024 16:06:41 +0800 Subject: [PATCH 1/2] Update some configurations --- .github/workflows/build.yml | 2 +- build.gradle.kts | 2 +- gradle.properties | 2 +- sqllin-driver/build.gradle.kts | 5 ----- sqllin-dsl/build.gradle.kts | 5 ----- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8623597..48501fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -86,7 +86,7 @@ jobs: emulator-build: 11698152 force-avd-creation: false emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: false + disable-animations: true script: echo "Generated AVD snapshot for caching." - name: Run Android 14 Instrumented Tests diff --git a/build.gradle.kts b/build.gradle.kts index b3c9682..c2f3b8b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ buildscript { dependencies { val kotlinVersion: String by project classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion") - classpath("com.android.tools.build:gradle:8.2.1") + classpath("com.android.tools.build:gradle:8.2.2") } } diff --git a/gradle.properties b/gradle.properties index c0c7bce..1a1259c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -19,7 +19,7 @@ mavenRepositoryURL=https://oss.sonatype.org/service/local/staging/deploy/maven2 #Gradle org.gradle.daemon=true -org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 +org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Djdk.attach.allowAttachSelf=true org.gradle.workers.max=16 org.gradle.parallel=true org.gradle.caching=true diff --git a/sqllin-driver/build.gradle.kts b/sqllin-driver/build.gradle.kts index 11501fa..bb52993 100644 --- a/sqllin-driver/build.gradle.kts +++ b/sqllin-driver/build.gradle.kts @@ -200,9 +200,4 @@ publishing { useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD) sign(publishing.publications) } -} - -// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed -project.tasks.withType(AbstractPublishToMaven::class.java).configureEach { - dependsOn(project.tasks.withType(Sign::class.java)) } \ No newline at end of file diff --git a/sqllin-dsl/build.gradle.kts b/sqllin-dsl/build.gradle.kts index a365264..e8a0937 100644 --- a/sqllin-dsl/build.gradle.kts +++ b/sqllin-dsl/build.gradle.kts @@ -226,9 +226,4 @@ publishing { useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD) sign(publishing.publications) } -} - -// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed -project.tasks.withType(AbstractPublishToMaven::class.java).configureEach { - dependsOn(project.tasks.withType(Sign::class.java)) } \ No newline at end of file From 4c233a0e9c1e42cf38e337a02a9da663e7c83e65 Mon Sep 17 00:00:00 2001 From: qiaoyuang Date: Tue, 30 Apr 2024 16:17:48 +0800 Subject: [PATCH 2/2] Modify the configuration of AVD --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 48501fe..f46dfe2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -248,7 +248,7 @@ jobs: emulator-build: 11698152 force-avd-creation: false emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - disable-animations: false + disable-animations: true script: echo "Generated AVD snapshot for caching." - name: Run Android 8 Instrumented Tests