chore: update android build recipe
Pyxis/fieldnotes/pipeline/head This commit is unstable Details

This commit is contained in:
wpetit 2023-03-06 15:27:47 +01:00
parent 6f77fc1765
commit 86898bb820
2 changed files with 32 additions and 17 deletions

View File

@ -2,7 +2,6 @@
buildscript {
ext {
versionMajor = 1
versionMinor = 0
versionPatch = 1
@ -11,20 +10,21 @@ buildscript {
versionCodeOverride = System.getenv('VERSION_CODE_OVERRIDE') ? System.getenv('VERSION_CODE_OVERRIDE').toInteger() : null
releaseChannel = System.getenv('RELEASE_CHANNEL')
releaseAppIdSuffix = System.getenv('RELEASE_APP_ID_SUFFIX')
buildToolsVersion = "29.0.3"
buildToolsVersion = '29.0.3'
minSdkVersion = 23
compileSdkVersion = 29
compileSdkVersion = 31
targetSdkVersion = 29
osmdroidVersion = '6.0.1'
supportLibVersion = "28.0.0"
ndkVersion = "20.1.5948944"
supportLibVersion = '28.0.0'
ndkVersion = '20.1.5948944'
kotlinVersion = '1.6.0'
}
repositories {
google()
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url 'https://jitpack.io' }
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
@ -33,8 +33,8 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:4.1.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
}
@ -44,19 +44,34 @@ allprojects {
jcenter()
mavenLocal()
maven {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
// 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")
// Android JSC is installed from npm
url("$rootDir/../node_modules/jsc-android/dist")
}
exclusiveContent {
// We get React Native's Android binaries exclusively through npm,
// from a local Maven repo inside node_modules/react-native/.
// (The use of exclusiveContent prevents looking elsewhere like Maven Central
// and potentially getting a wrong version.)
filter {
includeGroup 'com.facebook.react'
}
forRepository {
maven {
// NOTE: if you are in a monorepo, you may have "$rootDir/../../../node_modules/react-native/android"
url "$rootDir/../node_modules/react-native/android"
}
}
}
}
}
subprojects {
afterEvaluate {project ->
if (project.hasProperty("android")) {
afterEvaluate { project ->
if (project.hasProperty('android')) {
android {
compileOptions.encoding = 'utf-8'
compileSdkVersion rootProject.ext.compileSdkVersion
@ -72,4 +87,4 @@ subprojects {
// task wrapper(type: Wrapper) {
// gradleVersion = '4.10'
// distributionUrl = distributionUrl.replace("bin", "all")
// }
// }

View File

@ -10,7 +10,7 @@ ENV PATH=${PATH}:/usr/local/go/bin/:${ANDROID_HOME}/tools:${ANDROID_HOME}/tools/
# Install utilities
RUN apt-get update -y \
&& apt-get install -y wget curl tar build-essential ca-certificates git openjdk-8-jdk-headless unzip locales jq moreutils
&& apt-get install -y wget curl tar build-essential ca-certificates git openjdk-11-jdk-headless unzip locales jq moreutils
# Set locale
RUN locale-gen en_US.UTF-8