From 1c86488ce750cc0d72d27ac764fdfec6cd749088 Mon Sep 17 00:00:00 2001 From: Greg Price Date: Thu, 18 Jul 2019 13:55:33 -0700 Subject: [PATCH] android build: Cut never-used Buck config. This all comes from the template React Native app. We don't use Buck and never have; so the only thing this BUCK file and other stuff can do is cause confusion. Take it out. --- .flowconfig | 3 -- .gitignore | 6 ---- android/app/BUCK | 66 ---------------------------------------- android/app/build.gradle | 7 ----- 4 files changed, 82 deletions(-) delete mode 100644 android/app/BUCK diff --git a/.flowconfig b/.flowconfig index 4ca09d5739b..0543d1e3fc6 100644 --- a/.flowconfig +++ b/.flowconfig @@ -2,9 +2,6 @@ ; We fork some components by platform .*/*[.]android.js -; Ignore "BUCK" generated dirs -/\.buckd/ - ; Ignore unexpected extra "@providesModule" .*/node_modules/.*/node_modules/fbjs/.* diff --git a/.gitignore b/.gitignore index 092e5a3d301..85ab338602b 100644 --- a/.gitignore +++ b/.gitignore @@ -36,12 +36,6 @@ local.properties node_modules/ npm-debug.log -# BUCK -buck-out/ -\.buckd/ -android/app/libs -android/keystores/debug.keystore - ### ^ ### The portion of this file above this line comes from RN upstream's ### template. We leave that part unchanged as much as we can, to help diff --git a/android/app/BUCK b/android/app/BUCK deleted file mode 100644 index fadc84f15d8..00000000000 --- a/android/app/BUCK +++ /dev/null @@ -1,66 +0,0 @@ -import re - -# To learn about Buck see [Docs](https://buckbuild.com/). -# To run your application with Buck: -# - install Buck -# - `npm start` - to start the packager -# - `cd android` -# - `keytool -genkey -v -keystore keystores/debug.keystore -storepass android -alias androiddebugkey -keypass android -dname "CN=Android Debug,O=Android,C=US` -# - `./gradlew :app:copyDownloadableDepsToLibs` - make all Gradle compile dependencies available to Buck -# - `buck install -r android/app` - compile, install and run application -# - -lib_deps = [] -for jarfile in glob(['libs/*.jar']): - name = 'jars__' + re.sub(r'^.*/([^/]+)\.jar$', r'\1', jarfile) - lib_deps.append(':' + name) - prebuilt_jar( - name = name, - binary_jar = jarfile, - ) - -for aarfile in glob(['libs/*.aar']): - name = 'aars__' + re.sub(r'^.*/([^/]+)\.aar$', r'\1', aarfile) - lib_deps.append(':' + name) - android_prebuilt_aar( - name = name, - aar = aarfile, - ) - -android_library( - name = 'all-libs', - exported_deps = lib_deps -) - -android_library( - name = 'app-code', - srcs = glob([ - 'src/main/java/**/*.java', - ]), - deps = [ - ':all-libs', - ':build_config', - ':res', - ], -) - -android_build_config( - name = 'build_config', - package = 'com.zulipmobile', -) - -android_resource( - name = 'res', - res = 'src/main/res', - package = 'com.zulipmobile', -) - -android_binary( - name = 'app', - package_type = 'debug', - manifest = 'src/main/AndroidManifest.xml', - keystore = '//android/keystores:debug', - deps = [ - ':app-code', - ], -) diff --git a/android/app/build.gradle b/android/app/build.gradle index 045ac844327..34fe633408a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -224,10 +224,3 @@ tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { jvmTarget = "1.8" } } - -// Run this once to be able to run the application with BUCK -// puts all compile dependencies into folder libs for BUCK to use -task copyDownloadableDepsToLibs(type: Copy) { - from configurations.compile - into 'libs' -}