Skip to content

Commit d685cce

Browse files
authored
Merge pull request #89 from qiaoyuang/main
Update some configurations
2 parents 757937f + 4c233a0 commit d685cce

5 files changed

Lines changed: 4 additions & 14 deletions

File tree

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ jobs:
8686
emulator-build: 11698152
8787
force-avd-creation: false
8888
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
89-
disable-animations: false
89+
disable-animations: true
9090
script: echo "Generated AVD snapshot for caching."
9191

9292
- name: Run Android 14 Instrumented Tests
@@ -248,7 +248,7 @@ jobs:
248248
emulator-build: 11698152
249249
force-avd-creation: false
250250
emulator-options: -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none
251-
disable-animations: false
251+
disable-animations: true
252252
script: echo "Generated AVD snapshot for caching."
253253

254254
- name: Run Android 8 Instrumented Tests

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
dependencies {
88
val kotlinVersion: String by project
99
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
10-
classpath("com.android.tools.build:gradle:8.2.1")
10+
classpath("com.android.tools.build:gradle:8.2.2")
1111
}
1212
}
1313

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mavenRepositoryURL=https://oss.sonatype.org/service/local/staging/deploy/maven2
1919

2020
#Gradle
2121
org.gradle.daemon=true
22-
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
22+
org.gradle.jvmargs=-Xmx8g -XX:MaxMetaspaceSize=16g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8 -Djdk.attach.allowAttachSelf=true
2323
org.gradle.workers.max=16
2424
org.gradle.parallel=true
2525
org.gradle.caching=true

sqllin-driver/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,4 @@ publishing {
200200
useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD)
201201
sign(publishing.publications)
202202
}
203-
}
204-
205-
// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
206-
project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
207-
dependsOn(project.tasks.withType(Sign::class.java))
208203
}

sqllin-dsl/build.gradle.kts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,4 @@ publishing {
226226
useInMemoryPgpKeys(SIGNING_KEY_ID, SIGNING_KEY, SIGNING_PASSWORD)
227227
sign(publishing.publications)
228228
}
229-
}
230-
231-
// TODO: remove after https://youtrack.jetbrains.com/issue/KT-46466 is fixed
232-
project.tasks.withType(AbstractPublishToMaven::class.java).configureEach {
233-
dependsOn(project.tasks.withType(Sign::class.java))
234229
}

0 commit comments

Comments
 (0)