Duration support

instacart · Mar 20, 2023 · f4deac5 · f4deac5
1 parent 75f9ee0
commit f4deac5
Show file tree

Hide file tree

Showing 11 changed files with 319 additions and 148 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -54,7 +54,7 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.0'
 
     implementation "io.reactivex.rxjava2:rxandroid:2.1.1"
 }
diff --git a/app/src/main/java/com/instacart/sample/SampleActivity.kt b/app/src/main/java/com/instacart/sample/SampleActivity.kt
@@ -21,6 +21,7 @@ import java.time.format.DateTimeFormatter
 import java.util.*
 import kotlin.concurrent.schedule
 import kotlinx.coroutines.*
+import kotlin.time.Duration.Companion.milliseconds
 
 @SuppressLint("SetTextI18n")
 @RequiresApi(Build.VERSION_CODES.O)
@@ -68,11 +69,11 @@ class SampleActivity : AppCompatActivity() {
       val params =
           TrueTimeParameters.Builder()
               .ntpHostPool(arrayListOf("time.apple.com"))
-              .connectionTimeoutInMillis(31428)
-              .syncIntervalInMillis(5_000)
+              .connectionTimeout(31428.milliseconds)
+              .syncInterval(5_000.milliseconds)
               .retryCountAgainstSingleIp(3)
               .returnSafelyWhenUninitialized(false)
-              .serverResponseDelayMaxInMillis(900) // this value is pretty high (coding on a plane)
+              .serverResponseDelayMax(900.milliseconds) // this value is pretty high (coding on a plane)
               .buildParams()
 
       sampleTrueTime = TrueTimeImpl(params, listener = TrueTimeLogEventListener())

diff --git a/app/src/main/java/com/instacart/sample/TrueTimeLogEventListener.kt b/app/src/main/java/com/instacart/sample/TrueTimeLogEventListener.kt
@@ -6,6 +6,7 @@ import com.instacart.truetime.sntp.SntpResult
 import com.instacart.truetime.time.TrueTimeParameters
 import java.net.InetAddress
 import java.util.*
+import kotlin.time.Duration
 
 class TrueTimeLogEventListener : TrueTimeEventListener {
   override fun initialize(params: TrueTimeParameters) {
@@ -20,8 +21,8 @@ class TrueTimeLogEventListener : TrueTimeEventListener {
     Log.e("TrueTime4", "initialization call failed with a generic exception", e)
   }
 
-  override fun nextInitializeIn(delayInMillis: Long) {
-    Log.v("TrueTime4", " next initialization call will be made in $delayInMillis ms")
+  override fun nextInitializeIn(delay: Duration) {
+    Log.v("TrueTime4", " next initialization call will be made in ${delay.inWholeMilliseconds} ms")
   }
 
   override fun resolvedNtpHostToIPs(ntpHost: String, ipList: List<InetAddress>) {

diff --git a/build.gradle b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath 'com.android.tools.build:gradle:7.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 24 18:26:41 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip