Skip to content

Commit f5892fa

Browse files
RBusarowRBusarow
authored
Merge pull request #1133 from square/rick/better-java-version-handling
revert jdk target to 1.8
2 parents a073005 + b3979e9 commit f5892fa

File tree

15 files changed

+140
-106
lines changed

15 files changed

+140
-106
lines changed

‎artifacts.json

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"artifactId": "workflow-internal-testing-utils",
66
"description": "Workflow internal testing utilities",
77
"packaging": "jar",
8-
"javaVersion": 17,
8+
"javaVersion": 8,
99
"publicationName": "maven"
1010
},
1111
{
@@ -14,7 +14,7 @@
1414
"artifactId": "trace-encoder",
1515
"description": "Trace Encoder",
1616
"packaging": "jar",
17-
"javaVersion": 17,
17+
"javaVersion": 8,
1818
"publicationName": "maven"
1919
},
2020
{
@@ -23,7 +23,7 @@
2323
"artifactId": "workflow-core-iosarm64",
2424
"description": "Workflow Core",
2525
"packaging": "klib",
26-
"javaVersion": 17,
26+
"javaVersion": 8,
2727
"publicationName": "iosArm64"
2828
},
2929
{
@@ -32,7 +32,7 @@
3232
"artifactId": "workflow-core-iossimulatorarm64",
3333
"description": "Workflow Core",
3434
"packaging": "klib",
35-
"javaVersion": 17,
35+
"javaVersion": 8,
3636
"publicationName": "iosSimulatorArm64"
3737
},
3838
{
@@ -41,7 +41,7 @@
4141
"artifactId": "workflow-core-iosx64",
4242
"description": "Workflow Core",
4343
"packaging": "klib",
44-
"javaVersion": 17,
44+
"javaVersion": 8,
4545
"publicationName": "iosX64"
4646
},
4747
{
@@ -50,7 +50,7 @@
5050
"artifactId": "workflow-core-js",
5151
"description": "Workflow Core",
5252
"packaging": "klib",
53-
"javaVersion": 17,
53+
"javaVersion": 8,
5454
"publicationName": "js"
5555
},
5656
{
@@ -59,7 +59,7 @@
5959
"artifactId": "workflow-core-jvm",
6060
"description": "Workflow Core",
6161
"packaging": "jar",
62-
"javaVersion": 17,
62+
"javaVersion": 8,
6363
"publicationName": "jvm"
6464
},
6565
{
@@ -68,7 +68,7 @@
6868
"artifactId": "workflow-core",
6969
"description": "Workflow Core",
7070
"packaging": "jar",
71-
"javaVersion": 17,
71+
"javaVersion": 8,
7272
"publicationName": "kotlinMultiplatform"
7373
},
7474
{
@@ -77,7 +77,7 @@
7777
"artifactId": "workflow-runtime-iosarm64",
7878
"description": "Workflow Runtime",
7979
"packaging": "klib",
80-
"javaVersion": 17,
80+
"javaVersion": 8,
8181
"publicationName": "iosArm64"
8282
},
8383
{
@@ -86,7 +86,7 @@
8686
"artifactId": "workflow-runtime-iossimulatorarm64",
8787
"description": "Workflow Runtime",
8888
"packaging": "klib",
89-
"javaVersion": 17,
89+
"javaVersion": 8,
9090
"publicationName": "iosSimulatorArm64"
9191
},
9292
{
@@ -95,7 +95,7 @@
9595
"artifactId": "workflow-runtime-iosx64",
9696
"description": "Workflow Runtime",
9797
"packaging": "klib",
98-
"javaVersion": 17,
98+
"javaVersion": 8,
9999
"publicationName": "iosX64"
100100
},
101101
{
@@ -104,7 +104,7 @@
104104
"artifactId": "workflow-runtime-js",
105105
"description": "Workflow Runtime",
106106
"packaging": "klib",
107-
"javaVersion": 17,
107+
"javaVersion": 8,
108108
"publicationName": "js"
109109
},
110110
{
@@ -113,7 +113,7 @@
113113
"artifactId": "workflow-runtime-jvm",
114114
"description": "Workflow Runtime",
115115
"packaging": "jar",
116-
"javaVersion": 17,
116+
"javaVersion": 8,
117117
"publicationName": "jvm"
118118
},
119119
{
@@ -122,7 +122,7 @@
122122
"artifactId": "workflow-runtime",
123123
"description": "Workflow Runtime",
124124
"packaging": "jar",
125-
"javaVersion": 17,
125+
"javaVersion": 8,
126126
"publicationName": "kotlinMultiplatform"
127127
},
128128
{
@@ -131,7 +131,7 @@
131131
"artifactId": "workflow-rx2",
132132
"description": "Workflow RxJava2",
133133
"packaging": "jar",
134-
"javaVersion": 17,
134+
"javaVersion": 8,
135135
"publicationName": "maven"
136136
},
137137
{
@@ -140,7 +140,7 @@
140140
"artifactId": "workflow-testing-jvm",
141141
"description": "Workflow Testing",
142142
"packaging": "jar",
143-
"javaVersion": 17,
143+
"javaVersion": 8,
144144
"publicationName": "maven"
145145
},
146146
{
@@ -149,7 +149,7 @@
149149
"artifactId": "workflow-tracing",
150150
"description": "Workflow Tracing",
151151
"packaging": "jar",
152-
"javaVersion": 17,
152+
"javaVersion": 8,
153153
"publicationName": "maven"
154154
},
155155
{
@@ -158,7 +158,7 @@
158158
"artifactId": "workflow-config-android",
159159
"description": "Workflow Runtime Android Configuration",
160160
"packaging": "aar",
161-
"javaVersion": 17,
161+
"javaVersion": 8,
162162
"publicationName": "maven"
163163
},
164164
{
@@ -167,7 +167,7 @@
167167
"artifactId": "workflow-config-jvm",
168168
"description": "Workflow Runtime JVM Configuration",
169169
"packaging": "jar",
170-
"javaVersion": 17,
170+
"javaVersion": 8,
171171
"publicationName": "maven"
172172
},
173173
{
@@ -176,7 +176,7 @@
176176
"artifactId": "workflow-ui-compose",
177177
"description": "Workflow UI Compose",
178178
"packaging": "aar",
179-
"javaVersion": 17,
179+
"javaVersion": 8,
180180
"publicationName": "maven"
181181
},
182182
{
@@ -185,7 +185,7 @@
185185
"artifactId": "workflow-ui-compose-tooling",
186186
"description": "Workflow UI Compose Tooling",
187187
"packaging": "aar",
188-
"javaVersion": 17,
188+
"javaVersion": 8,
189189
"publicationName": "maven"
190190
},
191191
{
@@ -194,7 +194,7 @@
194194
"artifactId": "workflow-ui-container-android",
195195
"description": "Workflow UI Container Android",
196196
"packaging": "aar",
197-
"javaVersion": 17,
197+
"javaVersion": 8,
198198
"publicationName": "maven"
199199
},
200200
{
@@ -203,7 +203,7 @@
203203
"artifactId": "workflow-ui-container-common-jvm",
204204
"description": "Workflow UI Container",
205205
"packaging": "jar",
206-
"javaVersion": 17,
206+
"javaVersion": 8,
207207
"publicationName": "maven"
208208
},
209209
{
@@ -212,7 +212,7 @@
212212
"artifactId": "workflow-ui-core-android",
213213
"description": "Workflow UI Android",
214214
"packaging": "aar",
215-
"javaVersion": 17,
215+
"javaVersion": 8,
216216
"publicationName": "maven"
217217
},
218218
{
@@ -221,7 +221,7 @@
221221
"artifactId": "workflow-ui-core-common-jvm",
222222
"description": "Workflow UI Core",
223223
"packaging": "jar",
224-
"javaVersion": 17,
224+
"javaVersion": 8,
225225
"publicationName": "maven"
226226
},
227227
{
@@ -230,7 +230,7 @@
230230
"artifactId": "workflow-ui-radiography",
231231
"description": "Workflow UI Radiography Support",
232232
"packaging": "aar",
233-
"javaVersion": 17,
233+
"javaVersion": 8,
234234
"publicationName": "maven"
235235
}
236236
]

‎benchmarks/dungeon-benchmark/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import com.squareup.workflow1.buildsrc.internal.libsCatalog
2-
import com.squareup.workflow1.buildsrc.internal.version
1+
import com.rickbusarow.kgx.libsCatalog
2+
import com.rickbusarow.kgx.version
3+
import com.squareup.workflow1.buildsrc.internal.javaTarget
4+
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
35

46
plugins {
57
id("com.android.test")
@@ -13,12 +15,12 @@ android {
1315
compileSdk = libsCatalog.version("compileSdk").toInt()
1416

1517
compileOptions {
16-
sourceCompatibility = JavaVersion.VERSION_17
17-
targetCompatibility = JavaVersion.VERSION_17
18+
sourceCompatibility = javaTargetVersion
19+
targetCompatibility = javaTargetVersion
1820
}
1921

2022
kotlinOptions {
21-
jvmTarget = "17"
23+
jvmTarget = javaTarget
2224
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
2325
}
2426

‎benchmarks/performance-poetry/complex-benchmark/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import com.squareup.workflow1.buildsrc.internal.libsCatalog
2-
import com.squareup.workflow1.buildsrc.internal.version
1+
import com.rickbusarow.kgx.libsCatalog
2+
import com.rickbusarow.kgx.version
3+
import com.squareup.workflow1.buildsrc.internal.javaTarget
4+
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
35

46
plugins {
57
id("com.android.test")
@@ -13,12 +15,12 @@ android {
1315
compileSdk = libsCatalog.version("compileSdk").toInt()
1416

1517
compileOptions {
16-
sourceCompatibility = JavaVersion.VERSION_17
17-
targetCompatibility = JavaVersion.VERSION_17
18+
sourceCompatibility = javaTargetVersion
19+
targetCompatibility = javaTargetVersion
1820
}
1921

2022
kotlinOptions {
21-
jvmTarget = "17"
23+
jvmTarget = javaTarget
2224
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
2325
}
2426

‎benchmarks/performance-poetry/complex-poetry/build.gradle.kts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
import com.squareup.workflow1.buildsrc.internal.libsCatalog
2-
import com.squareup.workflow1.buildsrc.internal.version
1+
import com.rickbusarow.kgx.libsCatalog
2+
import com.rickbusarow.kgx.version
3+
import com.squareup.workflow1.buildsrc.internal.javaTarget
4+
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
35

46
plugins {
57
id("com.android.application")
@@ -10,12 +12,12 @@ android {
1012
compileSdk = libsCatalog.version("compileSdk").toInt()
1113

1214
compileOptions {
13-
sourceCompatibility = JavaVersion.VERSION_17
14-
targetCompatibility = JavaVersion.VERSION_17
15+
sourceCompatibility = javaTargetVersion
16+
targetCompatibility = javaTargetVersion
1517
}
1618

1719
kotlinOptions {
18-
jvmTarget = "17"
20+
jvmTarget = javaTarget
1921
}
2022

2123
defaultConfig {

‎build-logic/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ dependencies {
6363
compileOnly(gradleApi())
6464

6565
implementation(libs.android.gradle.plugin)
66+
implementation(libs.kgx)
6667
implementation(libs.dokka.gradle.plugin)
6768
implementation(libs.dropbox.dependencyGuard)
6869
implementation(libs.kotlin.gradle.plugin)

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidDefaultsPlugin.kt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package com.squareup.workflow1.buildsrc
22

33
import com.android.build.gradle.TestedExtension
4-
import com.squareup.workflow1.buildsrc.internal.libsCatalog
5-
import com.squareup.workflow1.buildsrc.internal.version
6-
import org.gradle.api.JavaVersion.VERSION_17
4+
import com.rickbusarow.kgx.libsCatalog
5+
import com.rickbusarow.kgx.version
6+
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
77
import org.gradle.api.Plugin
88
import org.gradle.api.Project
99

@@ -17,8 +17,8 @@ class AndroidDefaultsPlugin : Plugin<Project> {
1717

1818
testedExtension.compileOptions { compileOptions ->
1919

20-
compileOptions.sourceCompatibility = VERSION_17
21-
compileOptions.targetCompatibility = VERSION_17
20+
compileOptions.sourceCompatibility = target.javaTargetVersion
21+
compileOptions.targetCompatibility = target.javaTargetVersion
2222
}
2323

2424
testedExtension.defaultConfig { defaultConfig ->
@@ -30,7 +30,6 @@ class AndroidDefaultsPlugin : Plugin<Project> {
3030

3131
testedExtension.testOptions { testOptions ->
3232
testOptions.unitTests { unitTestOptions ->
33-
3433
unitTestOptions.isReturnDefaultValues = true
3534
unitTestOptions.isIncludeAndroidResources = true
3635
}

‎build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package com.squareup.workflow1.buildsrc
22

33
import com.android.build.gradle.TestedExtension
44
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
5+
import com.rickbusarow.kgx.dependency
6+
import com.rickbusarow.kgx.libsCatalog
57
import com.squareup.workflow1.buildsrc.internal.implementation
68
import com.squareup.workflow1.buildsrc.internal.invoke
7-
import com.squareup.workflow1.buildsrc.internal.library
8-
import com.squareup.workflow1.buildsrc.internal.libsCatalog
99
import org.gradle.api.Plugin
1010
import org.gradle.api.Project
1111

@@ -31,8 +31,8 @@ class AndroidSampleAppPlugin : Plugin<Project> {
3131
implementation(target.project(":workflow-runtime"))
3232
implementation(target.project(":workflow-config:config-android"))
3333

34-
implementation(target.libsCatalog.library("androidx-appcompat"))
35-
implementation(target.libsCatalog.library("timber"))
34+
implementation(target.libsCatalog.dependency("androidx-appcompat"))
35+
implementation(target.libsCatalog.dependency("timber"))
3636
}
3737
}
3838
}

0 commit comments

Comments
 (0)