Merge pull request #139 from scala-steward/update/guava-33.6.0-jre

Update guava to 33.6.0-jre

Author: ddworak

build.sbt

@@ -26,7 +26,7 @@ val slf4jVersion = "2.0.17"
 val logbackVersion = "1.5.32" // Tests only
 val commonsLang3Version = "3.20.0"
 val commonsCodecVersion = "1.21.0"
-val guavaVersion = "33.5.0-jre"
+val guavaVersion = "33.6.0-jre"
 val commonsNetVersion = "3.13.0"
 val scalatestVersion = "3.2.20"
 

scex-core/src/main/scala/com/avsystem/scex/compiler/CachingScexCompiler.scala

@@ -7,20 +7,21 @@ import com.avsystem.scex.validation.{SymbolValidator, SyntaxValidator}
 import com.google.common.cache.CacheBuilder
 import com.google.common.util.concurrent.ExecutionError
 
-import java.util.concurrent.{ExecutionException, TimeUnit}
+import java.time.Duration
+import java.util.concurrent.ExecutionException
 import scala.util.{Failure, Success, Try}
 
 trait CachingScexCompiler extends ScexCompiler {
 
   import com.avsystem.scex.util.CommonUtils._
 
   private val preprocessingCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.expressionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.expressionExpirationTime.value))
     .maximumSize(settings.expressionCacheSize.value)
     .build[(String, Boolean), (String, PositionMapping)]
 
   private val expressionCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.expressionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.expressionExpirationTime.value))
     .maximumSize(settings.expressionCacheSize.value)
     .build[ExpressionDef, Try[RawExpression]]
 

scex-core/src/main/scala/com/avsystem/scex/compiler/TemplateOptimizingScexCompiler.scala

@@ -1,7 +1,7 @@
 package com.avsystem.scex
 package compiler
 
-import java.util.concurrent.TimeUnit
+import java.time.Duration
 
 import com.avsystem.scex.compiler.ScexCompiler.{CompilationFailedException, CompileError}
 import com.avsystem.scex.compiler.TemplateOptimizingScexCompiler.ConversionSupplier
@@ -33,7 +33,7 @@ trait TemplateOptimizingScexCompiler extends ScexPresentationCompiler {
   import com.avsystem.scex.util.CacheImplicits._
 
   private val literalConversionsCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.expressionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.expressionExpirationTime.value))
     .build[(ExpressionProfile, String, String), Try[ConversionSupplier[Any]]]((compileLiteralConversion _).tupled)
 
   private def getLiteralConversion(exprDef: ExpressionDef) =

scex-core/src/main/scala/com/avsystem/scex/compiler/presentation/CachingScexPresentationCompiler.scala

@@ -1,7 +1,8 @@
 package com.avsystem.scex
 package compiler.presentation
 
-import java.util.concurrent.{ExecutionException, TimeUnit}
+import java.time.Duration
+import java.util.concurrent.ExecutionException
 import java.{lang => jl, util => ju}
 
 import com.avsystem.scex.compiler.ExpressionDef
@@ -21,19 +22,19 @@ trait CachingScexPresentationCompiler extends ScexPresentationCompiler {
   import com.avsystem.scex.util.CommonUtils._
 
   private val errorsCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.completionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.completionExpirationTime.value))
     .maximumSize(settings.errorsCacheSize.value)
     .build[ExpressionDef, List[CompileError]]
 
   private val scopeCompletionCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.completionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.completionExpirationTime.value))
     .maximumSize(settings.scopeCompletionCacheSize.value)
     .build[ExpressionDef, Completion]
 
   case class TypeMembersCacheKey(profile: ExpressionProfile, contextType: String, ownerType: TypeWrapper)
 
   private val typeMembersCache = CacheBuilder.newBuilder
-    .expireAfterAccess(settings.completionExpirationTime.value, TimeUnit.SECONDS)
+    .expireAfterAccess(Duration.ofSeconds(settings.completionExpirationTime.value))
     .maximumSize(settings.typeMembersCacheSize.value)
     .build[TypeMembersCacheKey, Vector[Member]]