From 94aa7e80022f985e08d8f1f4ca9e92a7fc55e60e Mon Sep 17 00:00:00 2001 From: Cristiano Coelho Date: Fri, 28 Jan 2022 10:11:05 -0300 Subject: [PATCH] Remove a bunch of gradle junk that will make it incompatible with upcoming gradle 7, which will be required by RN 0.68.x --- android/build.gradle | 126 +++++-------------------------------------- 1 file changed, 14 insertions(+), 112 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index 86c5d0d..133fd65 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,53 +1,28 @@ -buildscript { - repositories { - google() - jcenter() - } - - dependencies { - // Matches recent template from React Native (0.59) - // https://github.com/facebook/react-native/blob/0.59-stable/template/android/build.gradle#L16 - classpath 'com.android.tools.build:gradle:3.3.2' - } -} - -apply plugin: 'com.android.library' -apply plugin: 'maven' +def DEFAULT_COMPILE_SDK_VERSION = 29 +def DEFAULT_TARGET_SDK_VERSION = 29 def safeExtGet(prop, fallback) { rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback } -// Matches values in recent template from React Native (0.59) -// https://github.com/facebook/react-native/blob/0.59-stable/template/android/build.gradle#L5-L9 -def DEFAULT_COMPILE_SDK_VERSION = 28 -def DEFAULT_BUILD_TOOLS_VERSION = "28.0.3" -def DEFAULT_MIN_SDK_VERSION = 19 -def DEFAULT_TARGET_SDK_VERSION = 28 +apply plugin: 'com.android.library' + android { - compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) - buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION) + compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION) - defaultConfig { - minSdkVersion safeExtGet('minSdkVersion', DEFAULT_MIN_SDK_VERSION) - targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) - versionCode 1 - versionName "1.0" - } - lintOptions { - abortOnError false - } + defaultConfig { + minSdkVersion safeExtGet('minSdkVersion', 16) + targetSdkVersion safeExtGet('targetSdkVersion', DEFAULT_TARGET_SDK_VERSION) + versionCode 1 + versionName "1.0" + } } -repositories { - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - // Matches recent template from React Native (0.59) - // https://github.com/facebook/react-native/blob/0.59-stable/template/android/build.gradle#L30 - url "$projectDir/../node_modules/react-native/android" - } +repositories{ mavenCentral() + google() + jcenter() } dependencies { @@ -60,76 +35,3 @@ dependencies { implementation 'com.google.vr:sdk-panowidget:1.180.0' implementation 'commons-io:commons-io:2.5' } - -def configureReactNativePom(def pom) { - def packageJson = new groovy.json.JsonSlurper().parseText(file('../package.json').text) - - pom.project { - name packageJson.title - artifactId packageJson.name - version = packageJson.version - group = "nl.lightbase" - description packageJson.description - url packageJson.repository.baseUrl - - licenses { - license { - name packageJson.license - url packageJson.repository.baseUrl + '/blob/master/' + packageJson.licenseFilename - distribution 'repo' - } - } - - developers { - developer { - id packageJson.author.username - name packageJson.author.name - } - } - } -} - -afterEvaluate { project -> - // some Gradle build hooks ref: - // https://www.oreilly.com/library/view/gradle-beyond-the/9781449373801/ch03.html - task androidJavadoc(type: Javadoc) { - source = android.sourceSets.main.java.srcDirs - classpath += files(android.bootClasspath) - classpath += files(project.getConfigurations().getByName('compile').asList()) - include '**/*.java' - } - - task androidJavadocJar(type: Jar, dependsOn: androidJavadoc) { - classifier = 'javadoc' - from androidJavadoc.destinationDir - } - - task androidSourcesJar(type: Jar) { - classifier = 'sources' - from android.sourceSets.main.java.srcDirs - include '**/*.java' - } - - android.libraryVariants.all { variant -> - def name = variant.name.capitalize() - def javaCompileTask = variant.javaCompileProvider.get() - - task "jar${name}"(type: Jar, dependsOn: javaCompileTask) { - from javaCompileTask.destinationDir - } - } - - artifacts { - archives androidSourcesJar - archives androidJavadocJar - } - - task installArchives(type: Upload) { - configuration = configurations.archives - repositories.mavenDeployer { - // Deploy to react-native-event-bridge/maven, ready to publish to npm - repository url: "file://${projectDir}/../android/maven" - configureReactNativePom pom - } - } -}