Merge pull request #43 from oheyadam/include-okhttp

Add latest OkHttp dependency directly
androidx · Feb 7, 2024 · 84256cb · 84256cb
2 parents 5503cfd + c12663a
commit 84256cb
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 4 deletions.
diff --git a/core/build.gradle.kts b/core/build.gradle.kts
@@ -21,11 +21,13 @@ plugins {
 
 dependencies {
  implementation(gradleApi())
+ implementation(platform(libs.okhttp.bom))
  api(platform(libs.kotlin.bom))
  api(libs.kotlin.stdlib)
  implementation(libs.retrofit.core)
  implementation(libs.retrofit.converter.gson)
  implementation(libs.google.gson)
+ implementation(libs.okhttp)
 }
 
 testing {

diff --git a/gcpbuildcache/build.gradle.kts b/gcpbuildcache/build.gradle.kts
@@ -26,11 +26,13 @@ plugins {
 dependencies {
  // Bundle core library directly as we only get to publish one jar per plugin in Gradle Plugin Portal
  bundleInside(project(":core"))
+ implementation(platform(libs.okhttp.bom))
  implementation(libs.google.cloud.storage)
  implementation(libs.google.protobuf.java)
  implementation(libs.retrofit.core)
  implementation(libs.retrofit.converter.gson)
  implementation(libs.google.gson)
+ implementation(libs.okhttp)
 }
 
 gradlePlugin {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,20 +7,23 @@ s3-mock = "2.11.0"
 retrofit = "2.9.0"
 gson = "2.10.1"
 protobuf = "3.25.1"
+okhttp-bom = "4.12.0"
 
 [libraries]
 kotlin-bom = { group = "org.jetbrains.kotlin", name = "kotlin-bom", version.ref = "kotlin" }
 kotlin-stdlib = { group = "org.jetbrains.kotlin", name = "kotlin-stdlib-jdk8", version.ref = "kotlin" }
 amazon-bom = { group = "software.amazon.awssdk", name = "bom", version.ref = "amazon-bom" }
-amazon-s3 = { group = "software.amazon.awssdk", name = "s3", version.ref = "amazon-bom" }
-amazon-sso = { group = "software.amazon.awssdk", name = "sso", version.ref = "amazon-bom" }
-amazon-sts = { group = "software.amazon.awssdk", name = "sts", version.ref = "amazon-bom" }
+amazon-s3 = { group = "software.amazon.awssdk", name = "s3" }
+amazon-sso = { group = "software.amazon.awssdk", name = "sso" }
+amazon-sts = { group = "software.amazon.awssdk", name = "sts" }
 adobe-s3-mock = { group = "com.adobe.testing", name = "s3mock", version.ref = "s3-mock" }
 google-cloud-storage = { group = "com.google.cloud", name = "google-cloud-storage", version.ref = "google-cloud-storage" }
 google-gson = { group = "com.google.code.gson", name = "gson", version.ref = "gson" }
 google-protobuf-java = { module = "com.google.protobuf:protobuf-java", version.ref = "protobuf" }
 retrofit-core = { module = "com.squareup.retrofit2:retrofit", version.ref = "retrofit" }
 retrofit-converter-gson = { module = "com.squareup.retrofit2:converter-gson", version.ref = "retrofit" }
+okhttp-bom = { group = "com.squareup.okhttp3", name = "okhttp-bom", version.ref = "okhttp-bom" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }

diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys
@@ -1239,6 +1239,32 @@ ikmfPIGVw73RF3HXjJ8GVqTkqbo4ZpgTw/7Z3+fAYE/vxquhnpl2HvE=
 =5tlI
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub D433B437192A0FD1
+sub DEC13E939F583172
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQENBGIKzqQBCACwDbKHleoMe548Vqywi0VW39iqze5YSxcDr7FuD8XX2p2vlayS
+FXZUh2CujfTRGA+FPPVo8/MCtEfwPv42QbNJcR6EPd+mbJ76XYmGZ8RkJDrDIWBi
+YZk3MinUD8WHZx+zbM4TiFhUprFwG+gzIu/+TScn2aI/yPbv0QgrBfI+8MVlx7oV
+TWmAaYpFy9jWoucI9wu+bDyNX4a8wX7r/yqRt0PV2nLDERqXVm2u7Dj0tFeGzicJ
+XDTi2oAjgcJs4CYNz2c7d+ybatoFeNej0UwYkqR4WCAfgwGVYBXeDOBfdTEWMTyb
+0jlY6ObdbeGHIETfPBqT1S1XEfKmDniLI7qvABEBAAG5AQ0EYgrOpAEIALKNqsJf
+OgTGBLvEtGsZTrynVXF7LbFI/ObptkinKgidSuaAQo+wRgSS5DTPyFqHJYkD33Oo
+kvZTH/MFKUYZ+3s+cOnKo183fxvYVOxjv+kdYopJ6aLrl0txSAaQd5yySOGvcAwu
+NcJsCIggIhnbL+RJ92WmybMvnaDKrOtF2wBqQVK53K1AeGjJ8XxoIBgEfi5Bhu5E
+6M4yQrwvCk6Qo5zoWv7JaPhk46IrPf4r4kloFIgqDtIhSoIxNC4KSxQuTlk6pUGx
+Q6sCw7WKmpJI3c9oTejf+9XW/yu0y/JPZ9J2gI+JWoITGEUOQMeyGwsZbIsyXh1e
+13GF1hhHs9VwblcAEQEAAYkBPAQYAQIADwUCYgrOpAIbDAUJAeEzgAAhCRDUM7Q3
+GSoP0RYhBC3EjLtDUrSVOvb4A9QztDcZKg/RFg4H/3uPitH4PJgEduNFMtb19h2D
+Tm5v/577E9T9tzhEIYVrJb1lbfjAmRqD9GRo2FnLAS58QWqCW+KlqD4OKG2Gf0X/
+sozUXKcJ5l3iXMIg01qfDtiMQb9Qwa3SJPAFSw4Wb32s0SvIV2L1xyj0eIc65/jN
+8LDQZRkeQZ2qkYERkGBg7LlfV4sOx2PSkDJ+F5HWQRF45kc3b4iO1k4aSrvcLQyA
+76ZE6RDZemttX1rnggfY7N5azfrKoJ6SDChhIGoCzzfSkmyO7WO7qd2zysPVwYum
+kmtrFK0CzdQLZjp6dCHYAVRQX8e9z4MeiD79CkbZarW2rEaHZzDq4Eag3VtOyKw=
+=PvZk
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub D7C92B70FA1C814D
 uid Matthew Sicker (Signing Key) <[email protected]>
 
@@ -4338,6 +4364,27 @@ Glydu4Dtzwfkmu43CTGp
 =0MLa
 -----END PGP PUBLIC KEY BLOCK-----
 
+pub 66B50994442D2D40
+uid Square Clippy <[email protected]>
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: BCPG v1.68
+
+mQINBGDoYisBEACqUDZnT4h6ma6XIzdC6KR++uDbR2VKdhCuv0Og/sHEKkm6ZbG0
+OFB8tAaQx/WlsoQyf3DlLfUEOGDai875Aqor3fbM+E1hrZbQNfsOySKEE52k7PYe
+0qGWlnAzINuQaEuZwNw+pjZqPraMlwc/hwzJB8yFNHCv25pCFohK7KXvFGr5Fc6y
+NHBp6pM3pnDQ1kbkloDr32YZY2LdrfdkRqwa9STNMcZtM724aaInValFpVGEHolF
+dklo9MIsMI6mVHlxi6UwFSSLltUfTXGYY+rt2Q2sLNnEKzK1GvVhK996vrNWCvpr
+cdtbTzGE3WK4f2knhqzlaX99OLmkM1ah+p2EkK7HgWM9oEO7SYpNxKe/F/QfRNRS
+4W0aokPsEtfKCD7vQ3cRWQXdqFwvksilv+b6pcSrwfAsaCzVuhB3lcIra4MevJcH
+ZEbPrfGMi5/MIVtLayglLHSPoZtjQBhlqo8w3nuADR/aFlIUZ6NGOwaz5yXIGVEs
+6E1wiuILRAd7ecJ3Zyr/URHjawfHfKMM2tNCJKl48cScBMY61FJ1EmYzwhDw+at5
+D4pCk75eM5/t6VdYQ1cDWm7J3LGXEANMU5aSZMqgVnb4SQEmRxkW7oq3Z+GIkQQf
+Sj4OK6Oi4cUpM7b0m7Cbcsoqb6nD27VKD3J5KTYEq3e+78h0VRjhoi0Z+QARAQAB
+tCdTcXVhcmUgQ2xpcHB5IDxvcGVuc291cmNlQHNxdWFyZXVwLmNvbT4=
+=cBgo
+-----END PGP PUBLIC KEY BLOCK-----
+
 pub 68248959359E722B
 uid Remy Maucherat <[email protected]>
 

diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml
@@ -150,6 +150,7 @@
  <trusted-key id="D022218DCC08AAD6EF3AF876B3DE72E647D35161" group="org.testcontainers"/>
  <trusted-key id="D33620F0D0864EC924483F6F3FF95B4331B1F3B7" group="org.testcontainers"/>
  <trusted-key id="D4C89EA4AAF455FD88B22087EFE8086F9E93774E" group="junit"/>
+ <trusted-key id="DBD744ACE7ADE6AA50DD591F66B50994442D2D40" group="^com[.]squareup($|([.].*))" regex="true"/>
  <trusted-key id="E113159331A1F87BFC2A93D0960D2E8635A91268" group="org.hdrhistogram"/>
  <trusted-key id="E2ACB037933CDEAAB7BF77D49A2C7A98E457C53D">
  <trusting group="io.micrometer"/>

diff --git a/s3buildcache/build.gradle.kts b/s3buildcache/build.gradle.kts
@@ -26,10 +26,12 @@ plugins {
 dependencies {
  // Bundle core library directly as we only get to publish one jar per plugin in Gradle Plugin Portal
  bundleInside(project(":core"))
+ implementation(platform(libs.amazon.bom))
+ implementation(platform(libs.okhttp.bom))
  implementation(libs.retrofit.core)
  implementation(libs.retrofit.converter.gson)
  implementation(libs.google.gson)
- implementation(platform(libs.amazon.bom))
+ implementation(libs.okhttp)
  implementation(libs.amazon.s3)
  implementation(libs.amazon.sso)
  runtimeOnly(libs.amazon.sts) {