From 1b5f08d680f7f3c6ee660573a9992d6e6a67b6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Wed, 4 May 2022 19:38:21 +0200 Subject: [PATCH] Gradle: drop unavailable JCenter Bintray from config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This repository has been shut down a year ago: * https://jfrog.com/blog/into-the-sunset-bintray-jcenter-gocenter-and-chartcenter/ * https://testfairy.com/blog/jcenter-and-bintray-is-shutting-down-what-to-do/ And yet we still keep references to it in the Gradle config. Resolves: https://github.com/status-im/status-react/issues/13320 Signed-off-by: Jakub SokoĊ‚owski --- android/build.gradle | 31 +++++++++++++------------------ nix/deps/nodejs-patched/README.md | 2 +- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index fffbf0a580..a6183a5a39 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -17,12 +17,12 @@ buildscript { repositories { flatDir { dirs "libs", "${rootDir}/app/libs" } google() - jcenter() + mavenCentral() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31" classpath "com.android.tools.build:gradle:${project.ext.gradlePluginVersion}" - classpath "com.google.gms:google-services:4.3.10" + classpath "com.google.gms:google-services:4.3.10" // WARNING: Do not place your application dependencies here! // They belong in the individual module build.gradle files. } @@ -45,27 +45,22 @@ subprojects { allprojects { beforeEvaluate { - if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") { - throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!') - } + if (System.env.STATUS_GO_ANDROID_LIBDIR == null || System.env.STATUS_GO_ANDROID_LIBDIR == "") { + throw new GradleException('STATUS_GO_ANDROID_LIBDIR environment variable is not valid!') + } } repositories { mavenLocal() - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url("$rootDir/../node_modules/react-native/android") - } - maven { - // Android JSC is installed from npm - url("$rootDir/../node_modules/jsc-android/dist") - } - - google() - jcenter() - - // for geth, function, and status-go + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + maven { url("$rootDir/../node_modules/react-native/android") } + // Android JSC is installed from npm + maven { url("$rootDir/../node_modules/jsc-android/dist") } + // For geth, function, and status-go flatDir { dirs "libs", System.env.STATUS_GO_ANDROID_LIBDIR } + // Everything Else + google() + mavenCentral() maven { url "https://www.jitpack.io" } } } diff --git a/nix/deps/nodejs-patched/README.md b/nix/deps/nodejs-patched/README.md index 1fcf73c9c1..0b0c28cadd 100644 --- a/nix/deps/nodejs-patched/README.md +++ b/nix/deps/nodejs-patched/README.md @@ -8,7 +8,7 @@ Modules provided by `yarn2nix` are normally fine, but we use `react-native-*` pa ```js repositories { google() - jcenter() + maven { url "https://www.jitpack.io" } } ``` And these need to be patched and replaced with `mavenLocal()` to make sure Gradle doesn't try to fetch dependencies from remote repos.