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

Commit 374717dc authored by Wolfgang Grossinger's avatar Wolfgang Grossinger Committed by cketti
Browse files

Fix build problems with a fresh forked k-9 (#3874) 

Update build tools
parent cae0e22a

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ language: android 
android:

 components:

    - tools

    - build-tools-27.0.3

    - build-tools-28.0.3

    - android-27

    - extra-android-m2repository

app/k9mail/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ android { 
        exclude 'META-INF/NOTICE.txt'

        exclude 'META-INF/README'

        exclude 'LICENSE.txt'

        exclude 'META-INF/*.kotlin_module'

    }



    compileOptions {

build.gradle

+3 −3
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ buildscript { 
        buildConfig = [

                'compileSdk': 27,

                'minSdk': 19,

                'buildTools': '27.0.3'

                'buildTools': '28.0.3'

        ]



        versions = [

                'kotlin': '1.2.41',

                'kotlin': '1.2.71',

                'supportLibrary': '27.1.1',

                'preferencesFix': '27.1.1.1',

                'lifecycleExtensions': '1.1.0',
@@ -33,7 +33,7 @@ buildscript { 
    }



    dependencies {

        classpath 'com.android.tools.build:gradle:3.0.1'

        classpath 'com.android.tools.build:gradle:3.2.1'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}"

        classpath "org.jetbrains.kotlin:kotlin-android-extensions:${versions.kotlin}"

    }

gradle/wrapper/gradle-wrapper.properties

+2 −2
Original line number Diff line number Diff line 
#Sat Feb 17 03:09:27 CET 2018

#Mon Jan 14 21:39:12 CET 2019

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists

distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip

plugins/HoloColorPicker/AndroidManifest.xml

+0 −4
Original line number Diff line number Diff line
@@ -4,8 +4,4 @@ 
    android:versionCode="1"

    android:versionName="1.0" >



    <uses-sdk

        android:minSdkVersion="8"

        android:targetSdkVersion="16" />



</manifest>
 
 No newline at end of file