Skip to content

Commit a149841

Browse files
LikeTheSaladLikeTheSalad
committed
Moving versions to the catalog
1 parent a77de88 commit a149841

File tree

14 files changed

+91
-132
lines changed

14 files changed

+91
-132
lines changed

‎android-resource-api/build.gradle

+2-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
}
54

65
dependencies {
76
api project(":resource-api")
8-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9-
testImplementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
10-
testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
11-
}
12-
13-
compileKotlin {
14-
kotlinOptions.jvmTarget = "1.8"
15-
}
16-
compileTestKotlin {
17-
kotlinOptions.jvmTarget = "1.8"
7+
testImplementation libs.unitTesting
188
}

‎android-resource-collector/build.gradle

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
id 'kotlin-kapt'
54
}
65

76
dependencies {
87
api project(':resource-collector')
98
implementation "com.likethesalad.tools:android-tools-plugin:$androidTools_version"
109
implementation project(':android-resource-api')
11-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
12-
compileOnly "com.google.dagger:dagger:$dagger_version"
13-
kapt "com.google.dagger:dagger-compiler:$dagger_version"
14-
testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
10+
compileOnly libs.dagger
11+
kapt libs.dagger
12+
testImplementation libs.unitTesting
1513
testImplementation gradleApi()
1614
}
1715

18-
compileKotlin {
19-
kotlinOptions.jvmTarget = "1.8"
20-
}
21-
compileTestKotlin {
22-
kotlinOptions.jvmTarget = "1.8"
16+
libConventions {
17+
setJavaVersion("11")
2318
}
2419

2520
kapt {

‎android-resource-locator-test/build.gradle

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
plugins {
2+
alias(libs.plugins.java.library)
23
id 'java-gradle-plugin'
3-
id 'org.jetbrains.kotlin.jvm'
44
}
55

66
dependencies {
7-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
87
implementation project(':string-android-resource-locator')
98
compileOnly("com.android.tools.build:gradle:3.3.3")
10-
compileOnly "com.google.dagger:dagger:$dagger_version"
9+
compileOnly libs.dagger
1110
testImplementation "com.likethesalad.tools.testing:android-gradle:$testingUtilities_version"
1211
}
1312

13+
libConventions {
14+
setJavaVersion("11")
15+
}
16+
1417
tasks.withType(PluginUnderTestMetadata).configureEach {
1518
pluginClasspath.from(configurations.compileOnly)
1619
}
@@ -22,14 +25,6 @@ gradlePlugin {
2225
implementationClass = 'com.likethesalad.tools.resource.locator.android.test.TestAndroidResourceLocatorPlugin'
2326
}
2427
}
25-
automatedPublishing = false
26-
}
27-
28-
compileKotlin {
29-
kotlinOptions.jvmTarget = "1.8"
30-
}
31-
compileTestKotlin {
32-
kotlinOptions.jvmTarget = "1.8"
3328
}
3429

3530
artifactPublisherTarget {

‎android-resource-locator/build.gradle

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
id 'kotlin-kapt'
54
}
65

@@ -10,19 +9,16 @@ dependencies {
109
api project(":android-resource-collector")
1110
api project(':android-resource-serializer')
1211
api "com.likethesalad.tools:android-tools-plugin:$androidTools_version"
13-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
14-
implementation "com.google.code.gson:gson:$gson_version"
15-
compileOnly "com.google.dagger:dagger:$dagger_version"
16-
kapt "com.google.dagger:dagger-compiler:$dagger_version"
17-
testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
12+
implementation libs.gson
13+
compileOnly libs.dagger
14+
kapt libs.dagger
15+
testImplementation libs.unitTesting
1816
}
1917

20-
compileKotlin {
21-
kotlinOptions.jvmTarget = "1.8"
22-
}
23-
compileTestKotlin {
24-
kotlinOptions.jvmTarget = "1.8"
18+
libConventions {
19+
setJavaVersion("11")
2520
}
21+
2622
kapt {
2723
correctErrorTypes = true
2824
}

‎android-resource-serializer/build.gradle

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
}
54

65
dependencies {
76
api project(':resource-serializer')
87
implementation project(':android-resource-api')
9-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
10-
implementation "com.google.code.gson:gson:$gson_version"
11-
testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
12-
}
13-
14-
compileKotlin {
15-
kotlinOptions.jvmTarget = "1.8"
16-
}
17-
compileTestKotlin {
18-
kotlinOptions.jvmTarget = "1.8"
8+
implementation libs.gson
9+
testImplementation libs.unitTesting
1910
}

‎build.gradle

+4-28
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,7 @@
1-
buildscript {
2-
ext {
3-
kotlin_version = '1.5.10'
4-
}
5-
repositories {
6-
mavenCentral()
7-
google()
8-
gradlePluginPortal()
9-
}
10-
11-
dependencies {
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13-
classpath 'com.likethesalad.tools:artifact-publisher:1.1.0'
14-
classpath 'com.likethesalad.dagger:remapper-plugin:1.0.1'
15-
}
1+
plugins {
2+
alias(libs.plugins.artifactPublisher)
3+
id "com.likethesalad.dagger-remapper"
164
}
17-
apply plugin: 'artifact-publisher'
18-
apply plugin: 'com.likethesalad.dagger-remapper'
195

206
ext {
217
dagger_version = '2.39.1'
@@ -31,14 +17,4 @@ artifactPublisher {
3117
issueTrackerUrl = "https://github.com/LikeTheSalad/resource-locator/issues"
3218
}
3319

34-
group 'com.likethesalad.tools.resources'
35-
version '2.1.0'
36-
description 'Plugin that gathers resources from Android projects for compilation purposes.'
37-
38-
subprojects {
39-
repositories {
40-
mavenLocal()
41-
mavenCentral()
42-
google()
43-
}
44-
}
20+
description 'Plugin that gathers resources from Android projects for compilation purposes.'

‎gradle.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
kotlin.code.style=official
1+
kotlin.code.style=official
2+
group=com.likethesalad.tools.resources
3+
version=2.1.0

‎gradle/libs.versions.toml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[versions]
2+
project-utilities = "3.0.2"
3+
4+
[libraries]
5+
androidToolsPlugin = "com.likethesalad.tools:android-tools-plugin:1.5.1"
6+
dagger = "com.google.dagger:dagger:2.50"
7+
gson = "com.google.code.gson:gson:2.8.7"
8+
unitTesting = { module = "com.likethesalad.tools:unit-testing", version.ref = "project-utilities" }
9+
10+
[plugins]
11+
java-library = { id = "com.likethesalad.tools.java-library", version.ref = "project-utilities" }
12+
artifactPublisher = { id = "com.likethesalad.artifact-publisher", version = "2.0.2" }

‎gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

‎resource-api/build.gradle

+1-13
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
4-
}
5-
6-
dependencies {
7-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
8-
}
9-
10-
compileKotlin {
11-
kotlinOptions.jvmTarget = "1.8"
12-
}
13-
compileTestKotlin {
14-
kotlinOptions.jvmTarget = "1.8"
2+
alias(libs.plugins.java.library)
153
}

‎resource-collector/build.gradle

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
}
54

65
dependencies {
76
implementation project(":resource-api")
8-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9-
}
10-
11-
compileKotlin {
12-
kotlinOptions.jvmTarget = "1.8"
13-
}
14-
compileTestKotlin {
15-
kotlinOptions.jvmTarget = "1.8"
167
}

‎resource-serializer/build.gradle

+1-10
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,7 @@
11
plugins {
2-
id 'java-library'
3-
id 'org.jetbrains.kotlin.jvm'
2+
alias(libs.plugins.java.library)
43
}
54

65
dependencies {
76
api project(':resource-api')
8-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
9-
}
10-
11-
compileKotlin {
12-
kotlinOptions.jvmTarget = "1.8"
13-
}
14-
compileTestKotlin {
15-
kotlinOptions.jvmTarget = "1.8"
167
}

‎settings.gradle

+37
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,40 @@
1+
pluginManagement {
2+
repositories {
3+
mavenLocal()
4+
gradlePluginPortal()
5+
mavenCentral()
6+
google()
7+
}
8+
resolutionStrategy {
9+
eachPlugin {
10+
def pluginId = it.requested.id.id
11+
if (pluginId == "com.likethesalad.artifact-publisher") {
12+
useModule("com.likethesalad.tools:artifact-publisher:${it.requested.version}")
13+
}
14+
if (it.requested.id.namespace == "com.likethesalad.tools") {
15+
useModule("com.likethesalad.tools:plugin-tools:${it.requested.version}")
16+
}
17+
}
18+
}
19+
}
20+
dependencyResolutionManagement {
21+
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
22+
repositories {
23+
mavenLocal()
24+
mavenCentral()
25+
google()
26+
}
27+
}
28+
buildscript {
29+
repositories {
30+
gradlePluginPortal()
31+
mavenCentral()
32+
}
33+
dependencies {
34+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22"
35+
classpath 'com.likethesalad.dagger:remapper-plugin:1.0.1'
36+
}
37+
}
138
rootProject.name = 'resource-locator'
239
include ':android-resource-locator'
340
include ":resource-collector"

‎string-android-resource-locator/build.gradle

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
plugins {
2+
alias(libs.plugins.java.library)
23
id 'java-gradle-plugin'
3-
id 'org.jetbrains.kotlin.jvm'
44
id 'kotlin-kapt'
55
}
66

77
dependencies {
88
api project(":android-resource-locator")
9-
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
10-
testImplementation "com.likethesalad.tools.testing:unit-testing:$testingUtilities_version"
9+
testImplementation libs.unitTesting
10+
}
11+
12+
libConventions {
13+
setJavaVersion("11")
1114
}
1215

1316
gradlePlugin {
@@ -17,12 +20,4 @@ gradlePlugin {
1720
implementationClass = 'com.likethesalad.android.string.resources.locator.StringResourceLocatorPlugin'
1821
}
1922
}
20-
automatedPublishing = false
21-
}
22-
23-
compileKotlin {
24-
kotlinOptions.jvmTarget = "1.8"
25-
}
26-
compileTestKotlin {
27-
kotlinOptions.jvmTarget = "1.8"
2823
}

0 commit comments

Comments
 (0)