Skip to content

Commit

Permalink
Graal 21 Upgrade (square#6522)
Browse files Browse the repository at this point in the history
  • Loading branch information
yschimke authored Jan 23, 2021
1 parent 5396f41 commit e2f3093
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ buildscript {
'jsoup': '1.13.1',
'junit': '4.13',
'junit5': '5.7.0',
'kotlin': '1.4.20',
'kotlin': '1.4.21',
'moshi': '1.11.0',
'okio': '2.9.0',
'ktlint': '0.38.0',
Expand Down Expand Up @@ -58,7 +58,7 @@ buildscript {
]

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.20"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.10.1"
classpath "com.android.tools.build:gradle:4.0.2"
classpath deps.bnd
Expand Down
4 changes: 2 additions & 2 deletions native-image-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies {
implementation deps.junit5Api
implementation deps.junit5JupiterParams

implementation("org.graalvm.nativeimage:svm:20.3.0") {
implementation("org.graalvm.nativeimage:svm:21.0.0") {
// https://youtrack.jetbrains.com/issue/KT-29513
exclude group: "org.graalvm.nativeimage"
exclude group: "org.graalvm.truffle"
Expand Down Expand Up @@ -59,7 +59,7 @@ if (!isIDE) {
graal {
mainClass "okhttp3.RunTestsKt"
outputName "ConsoleLauncher"
graalVersion "20.3.0"
graalVersion "21.0.0"
javaVersion "11"

option "--no-fallback"
Expand Down
11 changes: 10 additions & 1 deletion native-image-tests/src/main/resources/testlist.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ okhttp3.AddressTest
okhttp3.CacheControlTest
okhttp3.CacheCorruptionTest
okhttp3.CacheTest
okhttp3.CallHandshakeTest
okhttp3.CallKotlinTest
okhttp3.CallTest
okhttp3.CertificateChainCleanerTest
Expand All @@ -19,10 +20,14 @@ okhttp3.FormBodyTest
okhttp3.HandshakeTest
okhttp3.HeadersKotlinTest
okhttp3.HeadersTest
okhttp3.HttpUrlGetTest
okhttp3.HttpUrlTest
okhttp3.InsecureForHostTest
okhttp3.InterceptorTest
okhttp3.KotlinDeprecationErrorTest
okhttp3.KotlinSourceModernTest
okhttp3.MediaTypeGetTest
okhttp3.MediaTypeTest
okhttp3.MultipartBodyTest
okhttp3.MultipartReaderTest
okhttp3.OkHttpClientTest
Expand All @@ -36,9 +41,11 @@ okhttp3.SampleTest
okhttp3.ServerTruncatesRequestTest
okhttp3.SocksProxyTest
okhttp3.URLConnectionTest
okhttp3.WebPlatformUrlTest
okhttp3.brotli.BrotliInterceptorJavaApiTest
okhttp3.brotli.BrotliInterceptorTest
okhttp3.dnsoverhttps.DnsOverHttpsTest
okhttp3.dnsoverhttps.DnsRecordCodecTest
okhttp3.internal.UtilTest
okhttp3.internal.authenticator.JavaNetAuthenticatorTest
okhttp3.internal.cache.DiskLruCacheTest
Expand All @@ -61,6 +68,7 @@ okhttp3.internal.http2.Http2ConnectionTest
okhttp3.internal.http2.Http2Test
okhttp3.internal.http2.HttpOverHttp2Test
okhttp3.internal.http2.HuffmanTest
okhttp3.internal.http2.SettingsTest
okhttp3.internal.io.FileSystemTest
okhttp3.internal.publicsuffix.PublicSuffixDatabaseTest
okhttp3.internal.tls.CertificatePinnerChainValidationTest
Expand All @@ -75,4 +83,5 @@ okhttp3.internal.ws.WebSocketWriterTest
okhttp3.logging.HttpLoggingInterceptorTest
okhttp3.logging.IsProbablyUtf8Test
okhttp3.logging.LoggingEventListenerTest
okhttp3.sse.internal.EventSourceHttpTest
okhttp3.sse.internal.EventSourceHttpTest
okhttp3.sse.internal.ServerSentEventIteratorTest
2 changes: 1 addition & 1 deletion okcurl/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ shadowJar {
graal {
mainClass "okhttp3.curl.Main"
outputName "okcurl"
graalVersion "20.3.0"
graalVersion "21.0.0"
javaVersion "11"

option "--no-fallback"
Expand Down

0 comments on commit e2f3093

Please sign in to comment.