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

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

Update deps and build tools

parent fe56b4b6
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -11,8 +11,8 @@ android:
  components:
    - tools
    - platform-tools
    - build-tools-24.0.2
    - android-24
    - build-tools-25.0.2
    - android-25
    - extra-android-m2repository
before_cache:
  - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
+5 −5
Original line number Diff line number Diff line
/*
 * Copyright 2013-2016 microG Project Team
 * Copyright 2013-2017 microG Project Team
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,19 +19,19 @@ buildscript {
        jcenter()
    }
    dependencies {
        classpath 'com.android.tools.build:gradle:2.2.2'
        classpath 'com.android.tools.build:gradle:2.2.3'
        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
    }
}

allprojects {
    apply plugin: 'idea'
    ext.androidBuildVersionTools = "24.0.2"
    ext.androidBuildVersionTools = "25.0.2"
}

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

def androidTargetSdk() { return 24 }
def androidTargetSdk() { return 23 }

def androidMinSdk() { return 7 }

+2 −2
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ android {
}

dependencies {
    compile 'com.android.support:support-v4:25.0.0'
    compile 'com.android.support:appcompat-v7:25.0.0'
    compile 'com.android.support:support-v4:25.1.0'
    compile 'com.android.support:appcompat-v7:25.1.0'
    compile 'com.takisoft.fix:preference-v7:25.0.0.1'
}
+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@
        android:ellipsize="end"
        android:maxLines="2"
        android:text="@string/v7_preference_on"
        android:textColor="?android:attr/textColorPrimaryInverse"
        android:theme="@style/TextAppearance.AppCompat.Title.Inverse"/>

    <org.microg.tools.ui.ToggleSwitch