-
Notifications
You must be signed in to change notification settings - Fork 24.4k
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.
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
[LOCAL] Make sure Java Toolchain and source/target level is applied to all projects #37576
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
...act-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
/* | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
package com.facebook.react.utils | ||
|
||
import com.android.build.api.variant.AndroidComponentsExtension | ||
import com.facebook.react.utils.PropertyUtils.INTERNAL_DISABLE_JAVA_VERSION_ALIGNMENT | ||
import org.gradle.api.Action | ||
import org.gradle.api.JavaVersion | ||
import org.gradle.api.Project | ||
import org.gradle.api.plugins.AppliedPlugin | ||
|
||
internal object JdkConfiguratorUtils { | ||
/** | ||
* Function that takes care of configuring the JDK toolchain for all the projects projects. As we | ||
* do decide the JDK version based on the AGP version that RNGP brings over, here we can safely | ||
* configure the toolchain to 11. | ||
*/ | ||
fun configureJavaToolChains(input: Project) { | ||
if (input.hasProperty(INTERNAL_DISABLE_JAVA_VERSION_ALIGNMENT)) { | ||
return | ||
} | ||
input.rootProject.allprojects { project -> | ||
val action = | ||
Action<AppliedPlugin> { | ||
project.extensions.getByType(AndroidComponentsExtension::class.java).finalizeDsl { | ||
ext -> | ||
ext.compileOptions.sourceCompatibility = JavaVersion.VERSION_11 | ||
ext.compileOptions.targetCompatibility = JavaVersion.VERSION_11 | ||
} | ||
} | ||
project.pluginManager.withPlugin("com.android.application", action) | ||
project.pluginManager.withPlugin("com.android.library", action) | ||
} | ||
} | ||
} |
18 changes: 18 additions & 0 deletions
18
...ages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/PropertyUtils.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
/* | ||
* Copyright (c) Meta Platforms, Inc. and affiliates. | ||
* | ||
* This source code is licensed under the MIT license found in the | ||
* LICENSE file in the root directory of this source tree. | ||
*/ | ||
|
||
package com.facebook.react.utils | ||
|
||
/** Collection of all the Gradle Propreties that are accepted by React Native Gradle Plugin. */ | ||
object PropertyUtils { | ||
|
||
/** | ||
* Internal Property that acts as a killswitch to configure the JDK version and align it for app | ||
* and all the libraries. | ||
*/ | ||
const val INTERNAL_DISABLE_JAVA_VERSION_ALIGNMENT = "react.internal.disableJavaVersionAlignment" | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: it's hasProperty so
react.internal.disableJavaVersionAlignment=false
will also disable the java version enforcement. but it doesn't really matter though 😅There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doesn't have permission to approve the pr, but it looks good to me. thanks @cortinico.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah I prefer this approach as the property is called
disable...
so we won't have to handle all the boolean cases (true/True/1/etc). Plus it's an.internal.
property so no need to be super strict here