Skip to content
This repository was archived by the owner on May 1, 2023. It is now read-only.

Commit 49b5efd

Browse files
passyfacebook-github-bot
authored andcommitted
Upgrade deps (#70)
Summary: We want to upgrade the NDK, but first we need to fix a bunch of other stuff to make that work. - Upgrade the Gradle plugin. That should just work. - Upgrade the release plugin. We need to change `LICENSE` to `LICENCE` for that. Sigh. - Fix GoogleTest which now also lives on a `main` branch. - Remove JCenter dependencies. Pull Request resolved: facebookincubator/fbjni#70 Test Plan: - ./gradlew assembleDebug - ./scripts/scripts/run-host-tests.sh - CI Reviewed By: lblasa Differential Revision: D32592380 Pulled By: passy fbshipit-source-id: ad1dcc2a16a1028b97934c800b690a50087c6454
1 parent d3ee21f commit 49b5efd

File tree

4 files changed

+14
-15
lines changed

4 files changed

+14
-15
lines changed

deps/fbjni/build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@
1717
buildscript {
1818
repositories {
1919
google()
20-
jcenter()
20+
mavenCentral()
2121
}
2222

2323
dependencies {
24-
classpath 'com.android.tools.build:gradle:4.1.2'
24+
classpath 'com.android.tools.build:gradle:4.1.3'
2525
}
2626
}
2727

2828
plugins {
29-
id 'com.vanniktech.maven.publish' version '0.13.0' apply false
29+
id 'com.vanniktech.maven.publish' version '0.18.0' apply false
3030
}
3131

3232
apply plugin: 'com.android.library'
3333
apply plugin: 'maven'
3434

3535
repositories {
3636
google()
37-
jcenter()
37+
mavenCentral()
3838
}
3939

4040
android {
@@ -50,7 +50,7 @@ android {
5050

5151
defaultConfig {
5252
minSdkVersion 15
53-
targetSdkVersion 29
53+
targetSdkVersion 31
5454
buildConfigField "boolean", "IS_INTERNAL_BUILD", 'true'
5555

5656
sourceSets {
@@ -87,7 +87,7 @@ android {
8787

8888
dependencies {
8989
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
90-
implementation 'com.facebook.soloader:nativeloader:0.10.1'
90+
implementation 'com.facebook.soloader:nativeloader:0.10.3'
9191
}
9292

9393
apply from: rootProject.file('gradle/release.gradle')

deps/fbjni/googletest-CMakeLists.txt.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ project(googletest-download NONE)
1010
include(ExternalProject)
1111
ExternalProject_Add(googletest
1212
GIT_REPOSITORY https://github.com/google/googletest.git
13-
GIT_TAG master
13+
GIT_TAG main
1414
SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
1515
BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
1616
CONFIGURE_COMMAND ""

deps/fbjni/gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ POM_URL=https://github.com/facebookincubator/fbjni
1111
POM_SCM_URL=https://github.com/facebookincubator/fbjni.git
1212
POM_SCM_CONNECTION=scm:git:https://github.com/facebookincubator/fbjni.git
1313
POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebookincubator/fbjni.git
14-
POM_LICENSE_NAME=APACHE-2
15-
POM_LICENSE_URL=https://github.com/facebookincubator/fbjni/blob/main/LICENSE
16-
POM_LICENSE_DIST=repo
14+
POM_LICENCE_NAME=APACHE-2
15+
POM_LICENCE_URL=https://github.com/facebookincubator/fbjni/blob/main/LICENSE
16+
POM_LICENCE_DIST=repo
1717
POM_DEVELOPER_ID=facebook
1818
POM_DEVELOPER_NAME=facebook
1919
POM_ISSUES_URL=https://github.com/facebookincubator/fbjni/issues/

deps/fbjni/host.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,11 @@
1616

1717
plugins {
1818
id 'java-library'
19-
id 'com.vanniktech.maven.publish' version '0.13.0' apply false
19+
id 'com.vanniktech.maven.publish' version '0.18.0' apply false
2020
}
2121

2222
repositories {
23-
mavenLocal()
24-
jcenter()
23+
mavenCentral()
2524
}
2625

2726
sourceSets {
@@ -35,8 +34,8 @@ sourceSets {
3534

3635
dependencies {
3736
compileOnly 'com.google.code.findbugs:jsr305:3.0.2'
38-
implementation 'com.facebook.soloader:nativeloader:0.10.1'
39-
testImplementation 'junit:junit:4.12'
37+
implementation 'com.facebook.soloader:nativeloader:0.10.3'
38+
testImplementation 'junit:junit:4.13.2'
4039
testImplementation 'org.easytesting:fest-assert-core:2.0M10'
4140
testImplementation 'org.mockito:mockito-core:2.28.2'
4241
}

0 commit comments

Comments
 (0)