Skip to content

Commit 273c586

Browse files
committed
migrated to gradle 9
1 parent 5e17f08 commit 273c586

7 files changed

Lines changed: 15 additions & 23 deletions

File tree

appexample/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33

44
plugins {
55
alias(libs.plugins.androidApplication)
6-
alias(libs.plugins.kotlinAndroid)
76
id("ch.ubique.gradle.poeditor")
87
}
98

109
android {
1110
namespace = "ch.ubique.poeditor.example"
12-
compileSdk = 34
11+
compileSdk = 36
1312

1413
defaultConfig {
1514
applicationId = "ch.ubique.poeditor.example"
1615
minSdk = 26
17-
targetSdk = 34
16+
targetSdk = 36
1817
versionCode = 1
1918
versionName = project.version.toString()
2019

@@ -29,12 +28,10 @@ android {
2928

3029
tasks.withType<KotlinCompile> {
3130
compilerOptions.jvmTarget = JvmTarget.JVM_17
32-
kotlinOptions.jvmTarget = JavaVersion.VERSION_17.toString()
3331
}
3432

3533
dependencies {
3634
implementation(libs.androidx.appcompat)
37-
implementation(libs.androidx.lifecycle.viewmodelKtx)
3835
}
3936

4037
poeditor {
@@ -44,4 +41,5 @@ poeditor {
4441
fallbackLanguage = "de"
4542
resourceDir = layout.buildDirectory.file("poeditor-output")
4643
fileName = "strings.xml"
44+
exportOptions = null
4745
}

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
plugins {
22
alias(libs.plugins.kotlin) apply false
33
alias(libs.plugins.androidApplication) apply false
4-
alias(libs.plugins.kotlinAndroid) apply false
54
}
65

76
tasks.register("clean", Delete::class.java) {

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,3 @@ android.useAndroidX=true
66

77
# Kotlin code style for this project: "official" or "obsolete":
88
kotlin.code.style=official
9-
10-
android.enableR8.fullMode=false

gradle/libs.versions.toml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
[versions]
2-
agp = "8.11.0"
3-
kotlin = "2.1.21"
4-
pluginPublish = "1.3.1"
5-
vanniktech = "0.33.0"
6-
ksp = "2.1.21-2.0.2"
2+
agp = "9.0.0"
3+
kotlin = "2.3.0"
4+
pluginPublish = "2.0.0"
5+
vanniktech = "0.36.0"
6+
ksp = "2.3.4"
77

8-
retrofit = "2.11.0"
9-
okhttp = "4.12.0"
8+
retrofit = "3.0.0"
9+
okhttp = "5.3.2"
1010
moshi = "1.15.2"
1111

1212
androidx-appcompat = "1.7.1"
13-
androidx-lifecycle = "2.9.1"
1413

1514
[plugins]
1615
kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
1716
pluginPublish = { id = "com.gradle.plugin-publish", version.ref = "pluginPublish"}
1817
androidApplication = { id = "com.android.application", version.ref = "agp" }
19-
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
2018
vanniktech = { id = "com.vanniktech.maven.publish", version.ref = "vanniktech" }
2119
ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" }
2220

@@ -32,6 +30,5 @@ moshi-adapters = { module = "com.squareup.moshi:moshi-adapters", version.ref = "
3230
moshi-kotlin-codegen = { module = "com.squareup.moshi:moshi-kotlin-codegen", version.ref = "moshi" }
3331

3432
androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" }
35-
androidx-lifecycle-viewmodelKtx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "androidx-lifecycle" }
3633

3734
junit = "junit:junit:4.13.2"

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.14.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

poeditor/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.14.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

poeditor/plugin/src/main/kotlin/ch/ubique/gradle/poeditor/config/PoEditorPluginConfig.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ constructor(project: Project) {
1414
/**
1515
* The API key for the PoEditor API.
1616
*/
17-
val apiKey: Property<String?> = objects.property(String::class.java)
17+
val apiKey: Property<String> = objects.property(String::class.java)
1818

1919
/**
2020
* The ID of the PoEditor project to pull translations from.
@@ -34,7 +34,7 @@ constructor(project: Project) {
3434
/**
3535
* The language code to use as the fallback language, i.e. when translations are missing, defaults to the project's fallback language.
3636
*/
37-
val fallbackLanguage: Property<String?> = objects.property(String::class.java)
37+
val fallbackLanguage: Property<String> = objects.property(String::class.java)
3838

3939
/**
4040
* The resource base directory to export the translations to, defaults to "src/main/res".
@@ -54,6 +54,6 @@ constructor(project: Project) {
5454
/**
5555
* Additional PoEditor export options as a JSON string, defaults to "[{\"unquoted\":1}]".
5656
*/
57-
val exportOptions: Property<String?> = objects.property(String::class.java).apply { set("[{\"unquoted\":1}]") }
57+
val exportOptions: Property<String> = objects.property(String::class.java).apply { set("[{\"unquoted\":1}]") }
5858

5959
}

0 commit comments

Comments
 (0)