update dependencies, move all versions to toml, new build cache internet check

barnhill · barnhill · commit 6e42b9dc3ed9 · 2025-07-27T19:26:00.000-05:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ComposePdfViewer [![Android CI](https://github.com/barnhill/ComposePdfViewer/actions/workflows/android.yml/badge.svg)](https://github.com/barnhill/ComposePdfViewer/actions/workflows/android.yml) [![API](https://img.shields.io/badge/API-19%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=23)
+# ComposePdfViewer [![Android CI](https://github.com/barnhill/ComposePdfViewer/actions/workflows/android.yml/badge.svg)](https://github.com/barnhill/ComposePdfViewer/actions/workflows/android.yml) [![API](https://img.shields.io/badge/API-24%2B-brightgreen.svg?style=flat)](https://android-arsenal.com/api?level=24)
 
 Android Composable for Viewing PDFs
 
@@ -7,13 +7,13 @@ This library provides an easy to consume Android Composable that will display PD
 ## Add the dependency
 
 ```Gradle
-implementation 'com.pnuema.android:pdfviewer:1.3.4'
+implementation 'com.pnuema.android:pdfviewer:1.4.0'
 ```
 ```Kotlin(KTS)
-implementation("com.pnuema.android:pdfviewer:1.3.4")
+implementation("com.pnuema.android:pdfviewer:1.4.0")
 ```
 ```TOML
-pdfviewer = { module = "com.pnuema.android:pdfviewer", version.ref = "1.3.4" }
+pdfviewer = { module = "com.pnuema.android:pdfviewer", version.ref = "1.4.0" }
 ```
 
 ## Usage
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -35,8 +35,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        jvmToolchain(JavaVersion.VERSION_17.toString().toInt())
     }
     buildFeatures {
         compose = true
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
 
 tasks {
     wrapper {
-        gradleVersion = "8.13"
+        gradleVersion = libs.versions.gradle.get()
         distributionType = Wrapper.DistributionType.BIN
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -28,7 +28,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 org.jetbrains.dokka.experimental.gradle.pluginMode.noWarn=true
 
 GROUP=com.pnuema.android
-VERSION_NAME=1.3.4
+VERSION_NAME=1.4.0
 
 POM_NAME=PdfViewer
 POM_ARTIFACT_ID=pdfviewer
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,24 +1,25 @@
 [versions]
 minSdk = "24"
-targetSdk = "35"
-androidx-appcompat = "1.7.0"
-androidx-compose-ui = "1.7.8"
-androidx-compose-viewmodel = "2.8.7"
+targetSdk = "36"
+gradle = "8.14.3"
+androidx-appcompat = "1.7.1"
+androidx-compose-ui = "1.8.3"
+androidx-compose-viewmodel = "2.9.2"
 androidx-material3 = "1.3.2"
 material = "1.12.0"
 androidx-activity = "1.10.1"
 androidx-core = "1.16.0"
-androidx-lifecycle = "2.8.7"
-okhttp = "4.12.0"
-zoomable = "0.15.1"
-compose-bom = "2025.04.00"
+androidx-lifecycle = "2.9.2"
+okhttp = "5.1.0"
+zoomable = "0.16.0"
+compose-bom = "2025.07.00"
 
 #plugins
-android-gradle-plugin = "8.9.1"
-kotlin = "2.1.20"
+android-gradle-plugin = "8.11.1"
+kotlin = "2.2.0"
 gradleCacheFix = "3.0.1"
 dokka = "2.0.0"
-vanniktech-maven-publish = "0.30.0"
+vanniktech-maven-publish = "0.34.0"
 
 [libraries]
 androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
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 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
diff --git a/pdfviewer/build.gradle.kts b/pdfviewer/build.gradle.kts
@@ -37,8 +37,8 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
+    kotlin {
+        jvmToolchain(JavaVersion.VERSION_17.toString().toInt())
     }
 }
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,5 +1,9 @@
 @file:Suppress("UnstableApiUsage")
 
+import java.io.IOException
+import java.net.Socket
+
+
 pluginManagement {
     repositories {
         google()
@@ -9,7 +13,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.develocity") version "3.19.2"
+    id("com.gradle.develocity") version "4.1"
 }
 
 dependencyResolutionManagement {
@@ -33,14 +37,19 @@ val cacheUrl: String? = if (System.getenv("REMOTE_CACHE_URL") == null) remoteCac
 
 if (cacheUrl != null) {
     buildCache {
+        local {
+            isEnabled = true
+        }
         remote<HttpBuildCache> {
             url = uri(cacheUrl)
-            isEnabled = true
+            isEnabled = isOnline()
             isPush = true
             isAllowUntrustedServer = true
             isAllowInsecureProtocol = false
             if (isEnabled) {
                 println("Using remote build cache: $cacheUrl")
+            } else {
+                println("Not using remote build cache!")
             }
 
             val remoteCacheUser: String? by extra
@@ -55,5 +64,19 @@ if (cacheUrl != null) {
     println("Not using remote build cache!")
 }
 
+fun isOnline(): Boolean {
+    try {
+        // Attempt to create a socket connection to a well-known server (e.g., Cloudflare DNS)
+        // This is a common way to check for basic internet connectivity.
+        // Adjust the host and port as needed for your network environment.
+        Socket("1.1.1.1", 53).close()
+        println("Internet connection test passed")
+        return true
+    } catch (_: IOException) {
+        println("Internet connection test failed, offline mode")
+        return false
+    }
+}
+
 rootProject.name = "ComposePdfViewer"
 include(":pdfviewer", ":app")

Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,8 @@ android {`
`35`	`35`	`sourceCompatibility = JavaVersion.VERSION_17`
`36`	`36`	`targetCompatibility = JavaVersion.VERSION_17`
`37`	`37`	`}`
`38`		`- kotlinOptions {`
`39`		`- jvmTarget = JavaVersion.VERSION_17.toString()`
	`38`	`+ kotlin {`
	`39`	`+ jvmToolchain(JavaVersion.VERSION_17.toString().toInt())`
`40`	`40`	`}`
`41`	`41`	`buildFeatures {`
`42`	`42`	`compose = true`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ plugins {`
`15`	`15`
`16`	`16`	`tasks {`
`17`	`17`	`wrapper {`
`18`		`- gradleVersion = "8.13"`
	`18`	`+ gradleVersion = libs.versions.gradle.get()`
`19`	`19`	`distributionType = Wrapper.DistributionType.BIN`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ android {`
`37`	`37`	`sourceCompatibility = JavaVersion.VERSION_17`
`38`	`38`	`targetCompatibility = JavaVersion.VERSION_17`
`39`	`39`	`}`
`40`		`- kotlinOptions {`
`41`		`- jvmTarget = JavaVersion.VERSION_17.toString()`
	`40`	`+ kotlin {`
	`41`	`+ jvmToolchain(JavaVersion.VERSION_17.toString().toInt())`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`