diff --git a/android/build.gradle b/android/build.gradle index fcdab512a..13bc5f8dc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,8 +7,6 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' - - apply plugin: 'kotlinx-serialization' android { @@ -32,7 +30,7 @@ android { externalNativeBuild { cmake { arguments '-DANDROID_TOOLCHAIN=clang', '-DANDROID_STL=c++_shared' - targets 'flipper', 'event_shared', 'event_extra_shared', 'event_core_shared' + targets 'flipper' } } } diff --git a/build.gradle b/build.gradle index 921ea79fa..827b7fb7d 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.4' + classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.vanniktech:gradle-maven-publish-plugin:0.20.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION" classpath "org.jetbrains.dokka:dokka-gradle-plugin:1.7.10" diff --git a/gradle.properties b/gradle.properties index 693b49806..7d4675a8f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,7 +21,7 @@ POM_ISSUES_URL=https://github.com/facebook/flipper/issues/ # Shared version numbers LITHO_VERSION=0.41.1 ANDROIDX_VERSION=1.3.0 -KOTLIN_VERSION=1.6.0 +KOTLIN_VERSION=1.6.20 # Gradle internals org.gradle.internal.repository.max.retries=10 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f2..41d9927a4 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da209da4f..e09c312b3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -5,6 +5,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists