jens/flipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set jvm flags and kotlin dependencies (#4177)

Browse Source 
Summary:
Pull Request resolved: https://github.com/facebook/flipper/pull/4177

^

In an attempt to fix Github actions, may or may not work.

Reviewed By: aigoncharov

Differential Revision: D40074397

fbshipit-source-id: e88039c56876ca21657db4a6d872c46294a4f8c3
This commit is contained in:
Lorenzo Blasa
2022-10-05 04:30:17 -07:00
committed by Facebook GitHub Bot
parent 303d88bd11
commit 76d6350662
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/plugins/leakcanary2/build.gradle
View File

@@ -20,7 +20,7 @@ android {
} }
dependencies { dependencies {
compileOnly "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION" compileOnly "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
implementation project(':android') implementation project(':android')
compileOnly deps.leakcanary2 compileOnly deps.leakcanary2
compileOnly deps.jsr305 compileOnly deps.jsr305

2
android/plugins/retrofit2-protobuf/build.gradle
View File

@@ -20,7 +20,7 @@ android {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION" implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
implementation project(':android') implementation project(':android')
implementation project(':network-plugin') implementation project(':network-plugin')
implementation deps.protobuf implementation deps.protobuf

2
android/tutorial/build.gradle
View File

@@ -39,7 +39,7 @@ android {
} }
dependencies { dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION" implementation "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION"
implementation "androidx.appcompat:appcompat:1.4.1" implementation "androidx.appcompat:appcompat:1.4.1"
implementation "androidx.core:core-ktx:1.8.0" implementation "androidx.core:core-ktx:1.8.0"

2
build.gradle
View File

@@ -54,7 +54,7 @@ ext {
ext.deps = [ ext.deps = [
// Kotlin support // Kotlin support
kotlinStdLibrary : "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION", kotlinStdLibrary : "org.jetbrains.kotlin:kotlin-stdlib:$KOTLIN_VERSION",
kotlinCoroutinesAndroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4", kotlinCoroutinesAndroid : "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4",
// Android support // Android support
supportAnnotations : "androidx.annotation:annotation:$ANDROIDX_VERSION", supportAnnotations : "androidx.annotation:annotation:$ANDROIDX_VERSION",

2
gradle.properties
View File

@@ -26,7 +26,7 @@ KOTLIN_VERSION=1.6.20
# Gradle internals # Gradle internals
org.gradle.internal.repository.max.retries=10 org.gradle.internal.repository.max.retries=10
org.gradle.internal.repository.initial.backoff=1250 org.gradle.internal.repository.initial.backoff=1250
org.gradle.jvmargs=-XX:MaxMetaspaceSize=512m org.gradle.jvmargs=-Xmx2g -Xms512m -XX:MaxPermSize=1024m -XX:+CMSClassUnloadingEnabled
systemProp.org.gradle.internal.http.connectionTimeout=120000 systemProp.org.gradle.internal.http.connectionTimeout=120000
systemProp.org.gradle.internal.http.socketTimeout=120000 systemProp.org.gradle.internal.http.socketTimeout=120000