Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0047182d authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'sprint_cordoba' into 'master'

[RELEASE] Sprint cordoba

See merge request e/apps/GmsCore!5
parents c0817e8e 912af072
Loading
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -25,11 +25,11 @@ build:
  script:
  - git submodule update --recursive --init
  - echo sdk.dir $ANDROID_HOME > local.properties
  - echo mapbox.key $MAPBOX_KEY >> local.properties
  - echo mapbox.enabled true >> local.properties
  - export TERM=dumb
  - export JAVA_OPTS="-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError -Xmx2048m"
  - ./gradlew build
  only:
    - tags
  - ./gradlew assemble
  artifacts:
    paths:
    - play-services-core/build/outputs/apk/
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ android:
  components:
  - tools
  - platform-tools
  - build-tools-28.0.3
  - build-tools-29.0.2
  - android-27
  - android-28
  - extra-android-m2repository
+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ buildscript {
        google()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:3.3.2'
        classpath 'com.android.tools.build:gradle:3.5.1'
        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
    }
@@ -29,7 +29,7 @@ buildscript {

allprojects {
    apply plugin: 'idea'
    ext.androidBuildVersionTools = "28.0.3"
    ext.androidBuildVersionTools = "29.0.2"
    ext.supportLibraryVersion = "28.0.0"
    ext.isReleaseVersion = false
    ext.slf4jVersion = "1.7.25"
@@ -37,7 +37,7 @@ allprojects {

def androidCompileSdk() { return 28 }

def androidTargetSdk() { return 28 }
def androidTargetSdk() { return 29 }

def androidMinSdk() { return 14 }

Compare 51509859 to 2a43448e
Original line number Diff line number Diff line
Subproject commit 51509859ae51097ad5789ba4ca2e9ffb9658f80e
Subproject commit 2a43448e49dc0aec0d6c53c8a27dd58245fdaba6
Compare 39d20ec1 to 15cd4491
Original line number Diff line number Diff line
Subproject commit 39d20ec1f28bcc4b134d76f43296bad587362c69
Subproject commit 15cd4491bcca57d627796b35b69bdf8c97564792
Loading