Skip to content

Commit 4263922

Browse files
committed
kotlin 2.0, gradle 8.10
1 parent 53ed82c commit 4263922

10 files changed

Lines changed: 20 additions & 20 deletions

app/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.application")
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.compose.compiler)
45
alias(libs.plugins.dokka)
56
}
67

@@ -40,9 +41,6 @@ android {
4041
buildFeatures {
4142
compose = true
4243
}
43-
composeOptions {
44-
kotlinCompilerExtensionVersion = "1.5.14"
45-
}
4644
packaging {
4745
resources {
4846
excludes += "/META-INF/{AL2.0,LGPL2.1}"

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,12 @@ plugins {
1010
alias(libs.plugins.kotlin.android).apply(false)
1111
alias(libs.plugins.maven.publish).apply(false)
1212
alias(libs.plugins.gradle.cachefix).apply(false)
13+
alias(libs.plugins.compose.compiler) apply false
1314
}
1415

1516
tasks {
1617
wrapper {
17-
gradleVersion = "8.7"
18+
gradleVersion = "8.10"
1819
distributionType = Wrapper.DistributionType.BIN
1920
}
2021
}

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ org.gradle.caching=true
2626
android.enableJetifier=false
2727

2828
GROUP=com.pnuema.android
29-
VERSION_NAME=1.2.0
29+
VERSION_NAME=1.2.1
3030

3131
POM_NAME=PdfViewer
3232
POM_ARTIFACT_ID=pdfviewer

gradle/libs.versions.toml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,17 @@ androidx-material3 = "1.2.1"
1010
material = "1.12.0"
1111
androidx-activity = "1.9.0"
1212
androidx-core = "1.13.1"
13-
androidx-lifecycle = "2.8.2"
13+
androidx-lifecycle = "2.8.4"
1414
okhttp = "4.12.0"
1515
zoomable = "0.11.2"
1616
compose-bom = "2024.06.00"
1717

1818
#plugins
19-
android-gradle-plugin = "8.4.2"
20-
kotlin = "1.9.24"
19+
android-gradle-plugin = "8.5.2"
20+
kotlin = "2.0.10"
2121
gradleCacheFix = "3.0.1"
2222
dokka = "1.9.20"
23-
vanniktech-maven-publish = "0.28.0"
23+
vanniktech-maven-publish = "0.29.0"
2424

2525
[libraries]
2626
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
@@ -47,3 +47,4 @@ kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
4747
maven-publish = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech-maven-publish" }
4848
gradle-cachefix = { id = "org.gradle.android.cache-fix", version.ref = "gradleCacheFix" }
4949
dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
50+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

gradle/wrapper/gradle-wrapper.jar

121 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

Lines changed: 5 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pdfviewer/build.gradle.kts

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
plugins {
22
alias(libs.plugins.android.library)
33
alias(libs.plugins.kotlin.android)
4+
alias(libs.plugins.compose.compiler)
45
alias(libs.plugins.maven.publish)
56
alias(libs.plugins.dokka)
67
}
78

8-
version = "1.1.0"
9+
version = "1.1.1"
910
group = "com.pnuema.android"
1011

1112
android {
@@ -38,12 +39,6 @@ android {
3839
kotlinOptions {
3940
jvmTarget = JavaVersion.VERSION_17.toString()
4041
}
41-
buildFeatures {
42-
compose = true
43-
}
44-
composeOptions {
45-
kotlinCompilerExtensionVersion = "1.5.14"
46-
}
4742
}
4843

4944
dependencies {

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pluginManagement {
99
}
1010

1111
plugins {
12-
id("com.gradle.develocity") version "3.17.5"
12+
id("com.gradle.develocity") version "3.17.6"
1313
}
1414

1515
dependencyResolutionManagement {

0 commit comments

Comments
 (0)