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

Verified Commit 70cfdb76 authored by Marvin W.'s avatar Marvin W. 🐿️
Browse files

Update build

parent 3f047dc3
Loading
Loading
Loading
Loading
+2 −12
Original line number Diff line number Diff line
language: android
sudo: false
git:
  submodules: false
before_install:
  - git submodule update --init --recursive
before_script:
  - echo sdk.dir $ANDROID_HOME > local.properties
script:
@@ -15,12 +11,6 @@ android:
  components:
  - tools
  - platform-tools
  - build-tools-24.0.3
  - android-24
  - build-tools-29.0.3
  - android-29
  - extra-android-m2repository
before_cache:
  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
cache:
  directories:
    - $HOME/.gradle/caches/
    - $HOME/.gradle/wrapper/
+5 −10
Original line number Diff line number Diff line
@@ -17,20 +17,19 @@
buildscript {
    repositories {
        jcenter()
        google()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:2.2.2'
        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
        classpath 'com.android.tools.build:gradle:3.6.3'
    }
}

allprojects {
    apply plugin: 'idea'
    ext.androidBuildVersionTools = "24.0.3"
    ext.isReleaseVersion = false
    ext.androidBuildVersionTools = "29.0.3"
}

def androidCompileSdk() { return 24 }
def androidCompileSdk() { return 29 }

def androidTargetSdk() { return 24 }

@@ -55,11 +54,7 @@ subprojects {
    group = 'org.microg'
    repositories {
        jcenter()
    }

    tasks.withType(JavaCompile) {
        sourceCompatibility = JavaVersion.VERSION_1_7
        targetCompatibility = JavaVersion.VERSION_1_7
        google()
    }
}
+2 −1
Original line number Diff line number Diff line
@@ -46,7 +46,8 @@ android {
    }

    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_6
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
}

+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@
<manifest package="com.android.vending"
          xmlns:android="http://schemas.android.com/apk/res/android">

    <uses-sdk
        android:minSdkVersion="10"
        android:targetSdkVersion="23"/>

    <uses-permission android:name="android.permission.FAKE_PACKAGE_SIGNATURE"/>
    <application
        android:icon="@drawable/icon"
+8.8 KiB (57.5 KiB)

File changed.

No diff preview for this file type.

Loading