Skip to content

Commit c36bef3

Browse files
Adjusted plugin to new gradle
1 parent 1dc1162 commit c36bef3

File tree

7 files changed

+261
-173
lines changed

7 files changed

+261
-173
lines changed

build.gradle

+12-19
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
plugins {
22
id 'groovy'
3-
id 'org.jetbrains.kotlin.jvm' version '1.7.0'
3+
id 'org.jetbrains.kotlin.jvm' version '2.0.21'
44
id "java-gradle-plugin"
5-
id "com.gradle.plugin-publish" version '0.21.0'
5+
id "com.gradle.plugin-publish" version '1.3.0'
66
id 'maven-publish'
77
}
88

99
group 'com.appunite.placeholdersvalidator'
10-
version '1.0.2'
10+
version '1.0.3'
1111

1212
repositories {
1313
jcenter()
@@ -17,28 +17,21 @@ dependencies {
1717
implementation localGroovy()
1818
implementation gradleApi()
1919
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
20-
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:1.7.0"
20+
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:2.0.21"
2121
testImplementation group: 'junit', name: 'junit', version: '4.12'
2222
}
2323

2424
gradlePlugin {
25-
plugins {
26-
placeholdersValidator {
27-
id = 'com.appunite.placeholdersvalidator'
28-
implementationClass = 'com.appunite.placeholdersvalidator.PlaceholdersValidatorPlugin'
29-
}
30-
}
31-
}
32-
33-
pluginBundle {
34-
description = 'Gradle plugin which validates placeholders from translated strings.xml files by comparing them with main strings.xml file.'
3525
website = 'https://github.com/appunite/android-placeholders-validator'
3626
vcsUrl = 'https://github.com/appunite/android-placeholders-validator'
37-
tags = ['android', 'strings', 'translations', 'resources', 'localization', 'placeholders', 'validation']
3827

3928
plugins {
4029
placeholdersValidator {
30+
id = 'com.appunite.placeholdersvalidator'
4131
displayName = 'Placeholders Validator'
32+
description = 'Gradle plugin which validates placeholders from translated strings.xml files by comparing them with main strings.xml file.'
33+
implementationClass = 'com.appunite.placeholdersvalidator.PlaceholdersValidatorPlugin'
34+
tags = ['android', 'strings', 'translations', 'resources', 'localization', 'placeholders', 'validation']
4235
}
4336
}
4437
}
@@ -55,13 +48,13 @@ publishing {
5548
}
5649

5750
compileKotlin {
58-
kotlinOptions.jvmTarget = "1.8"
51+
kotlinOptions.jvmTarget = JavaVersion.VERSION_21
5952
}
6053
compileTestKotlin {
61-
kotlinOptions.jvmTarget = "1.8"
54+
kotlinOptions.jvmTarget = JavaVersion.VERSION_21
6255
}
6356

6457
// Workaround for https://github.com/gradle/gradle/issues/17236
65-
tasks.withType(Copy).all {
66-
duplicatesStrategy 'exclude'
58+
tasks.withType(Copy).configureEach {
59+
duplicatesStrategy = DuplicatesStrategy.EXCLUDE
6760
}

gradle/wrapper/gradle-wrapper.jar

-11.4 KB
Binary file not shown.
+4-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Fri Sep 27 09:59:08 CEST 2019
2-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
31
distributionBase=GRADLE_USER_HOME
42
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
7+
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)