Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

revert jdk target to 1.8 #1133

Merged
merged 1 commit into from
Oct 25, 2023
Merged

revert jdk target to 1.8 #1133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions artifacts.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"artifactId": "workflow-internal-testing-utils",
"description": "Workflow internal testing utilities",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -14,7 +14,7 @@
"artifactId": "trace-encoder",
"description": "Trace Encoder",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -23,7 +23,7 @@
"artifactId": "workflow-core-iosarm64",
"description": "Workflow Core",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosArm64"
},
{
Expand All @@ -32,7 +32,7 @@
"artifactId": "workflow-core-iossimulatorarm64",
"description": "Workflow Core",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosSimulatorArm64"
},
{
Expand All @@ -41,7 +41,7 @@
"artifactId": "workflow-core-iosx64",
"description": "Workflow Core",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosX64"
},
{
Expand All @@ -50,7 +50,7 @@
"artifactId": "workflow-core-js",
"description": "Workflow Core",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "js"
},
{
Expand All @@ -59,7 +59,7 @@
"artifactId": "workflow-core-jvm",
"description": "Workflow Core",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "jvm"
},
{
Expand All @@ -68,7 +68,7 @@
"artifactId": "workflow-core",
"description": "Workflow Core",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "kotlinMultiplatform"
},
{
Expand All @@ -77,7 +77,7 @@
"artifactId": "workflow-runtime-iosarm64",
"description": "Workflow Runtime",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosArm64"
},
{
Expand All @@ -86,7 +86,7 @@
"artifactId": "workflow-runtime-iossimulatorarm64",
"description": "Workflow Runtime",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosSimulatorArm64"
},
{
Expand All @@ -95,7 +95,7 @@
"artifactId": "workflow-runtime-iosx64",
"description": "Workflow Runtime",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "iosX64"
},
{
Expand All @@ -104,7 +104,7 @@
"artifactId": "workflow-runtime-js",
"description": "Workflow Runtime",
"packaging": "klib",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "js"
},
{
Expand All @@ -113,7 +113,7 @@
"artifactId": "workflow-runtime-jvm",
"description": "Workflow Runtime",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "jvm"
},
{
Expand All @@ -122,7 +122,7 @@
"artifactId": "workflow-runtime",
"description": "Workflow Runtime",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "kotlinMultiplatform"
},
{
Expand All @@ -131,7 +131,7 @@
"artifactId": "workflow-rx2",
"description": "Workflow RxJava2",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -140,7 +140,7 @@
"artifactId": "workflow-testing-jvm",
"description": "Workflow Testing",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -149,7 +149,7 @@
"artifactId": "workflow-tracing",
"description": "Workflow Tracing",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -158,7 +158,7 @@
"artifactId": "workflow-config-android",
"description": "Workflow Runtime Android Configuration",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -167,7 +167,7 @@
"artifactId": "workflow-config-jvm",
"description": "Workflow Runtime JVM Configuration",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -176,7 +176,7 @@
"artifactId": "workflow-ui-compose",
"description": "Workflow UI Compose",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -185,7 +185,7 @@
"artifactId": "workflow-ui-compose-tooling",
"description": "Workflow UI Compose Tooling",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -194,7 +194,7 @@
"artifactId": "workflow-ui-container-android",
"description": "Workflow UI Container Android",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -203,7 +203,7 @@
"artifactId": "workflow-ui-container-common-jvm",
"description": "Workflow UI Container",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -212,7 +212,7 @@
"artifactId": "workflow-ui-core-android",
"description": "Workflow UI Android",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -221,7 +221,7 @@
"artifactId": "workflow-ui-core-common-jvm",
"description": "Workflow UI Core",
"packaging": "jar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
},
{
Expand All @@ -230,7 +230,7 @@
"artifactId": "workflow-ui-radiography",
"description": "Workflow UI Radiography Support",
"packaging": "aar",
"javaVersion": 17,
"javaVersion": 8,
"publicationName": "maven"
}
]
12 changes: 7 additions & 5 deletions benchmarks/dungeon-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import com.squareup.workflow1.buildsrc.internal.libsCatalog
import com.squareup.workflow1.buildsrc.internal.version
import com.rickbusarow.kgx.libsCatalog
import com.rickbusarow.kgx.version
import com.squareup.workflow1.buildsrc.internal.javaTarget
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion

plugins {
id("com.android.test")
Expand All @@ -13,12 +15,12 @@ android {
compileSdk = libsCatalog.version("compileSdk").toInt()

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = javaTargetVersion
targetCompatibility = javaTargetVersion
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really need to change sourceCompatilibity too? Will that, say, prevent us using language features that aren't actually supported?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's correct keeping them in sync will prevent us from inadvertently using Java language features that don't exist in the target environment.

}

kotlinOptions {
jvmTarget = "17"
jvmTarget = javaTarget
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}

Expand Down
12 changes: 7 additions & 5 deletions benchmarks/performance-poetry/complex-benchmark/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import com.squareup.workflow1.buildsrc.internal.libsCatalog
import com.squareup.workflow1.buildsrc.internal.version
import com.rickbusarow.kgx.libsCatalog
import com.rickbusarow.kgx.version
import com.squareup.workflow1.buildsrc.internal.javaTarget
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion

plugins {
id("com.android.test")
Expand All @@ -13,12 +15,12 @@ android {
compileSdk = libsCatalog.version("compileSdk").toInt()

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = javaTargetVersion
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = javaTarget
freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
}

Expand Down
12 changes: 7 additions & 5 deletions benchmarks/performance-poetry/complex-poetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import com.squareup.workflow1.buildsrc.internal.libsCatalog
import com.squareup.workflow1.buildsrc.internal.version
import com.rickbusarow.kgx.libsCatalog
import com.rickbusarow.kgx.version
import com.squareup.workflow1.buildsrc.internal.javaTarget
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion

plugins {
id("com.android.application")
Expand All @@ -10,12 +12,12 @@ android {
compileSdk = libsCatalog.version("compileSdk").toInt()

compileOptions {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = javaTargetVersion
targetCompatibility = javaTargetVersion
}

kotlinOptions {
jvmTarget = "17"
jvmTarget = javaTarget
}

defaultConfig {
Expand Down
1 change: 1 addition & 0 deletions build-logic/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ dependencies {
compileOnly(gradleApi())

implementation(libs.android.gradle.plugin)
implementation(libs.kgx)
implementation(libs.dokka.gradle.plugin)
implementation(libs.dropbox.dependencyGuard)
implementation(libs.kotlin.gradle.plugin)
Expand Down
11 changes: 5 additions & 6 deletions build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidDefaultsPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.squareup.workflow1.buildsrc

import com.android.build.gradle.TestedExtension
import com.squareup.workflow1.buildsrc.internal.libsCatalog
import com.squareup.workflow1.buildsrc.internal.version
import org.gradle.api.JavaVersion.VERSION_17
import com.rickbusarow.kgx.libsCatalog
import com.rickbusarow.kgx.version
import com.squareup.workflow1.buildsrc.internal.javaTargetVersion
import org.gradle.api.Plugin
import org.gradle.api.Project

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

testedExtension.compileOptions { compileOptions ->

compileOptions.sourceCompatibility = VERSION_17
compileOptions.targetCompatibility = VERSION_17
compileOptions.sourceCompatibility = target.javaTargetVersion
compileOptions.targetCompatibility = target.javaTargetVersion
}

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

testedExtension.testOptions { testOptions ->
testOptions.unitTests { unitTestOptions ->

unitTestOptions.isReturnDefaultValues = true
unitTestOptions.isIncludeAndroidResources = true
}
Expand Down
8 changes: 4 additions & 4 deletions build-logic/src/main/java/com/squareup/workflow1/buildsrc/AndroidSampleAppPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package com.squareup.workflow1.buildsrc

import com.android.build.gradle.TestedExtension
import com.android.build.gradle.internal.dsl.BaseAppModuleExtension
import com.rickbusarow.kgx.dependency
import com.rickbusarow.kgx.libsCatalog
import com.squareup.workflow1.buildsrc.internal.implementation
import com.squareup.workflow1.buildsrc.internal.invoke
import com.squareup.workflow1.buildsrc.internal.library
import com.squareup.workflow1.buildsrc.internal.libsCatalog
import org.gradle.api.Plugin
import org.gradle.api.Project

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

implementation(target.libsCatalog.library("androidx-appcompat"))
implementation(target.libsCatalog.library("timber"))
implementation(target.libsCatalog.dependency("androidx-appcompat"))
implementation(target.libsCatalog.dependency("timber"))
}
}
}
Loading
Loading