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

Commit 601e2880 authored by cketti's avatar cketti
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	src/com/fsck/k9/mail/transport/SmtpTransport.java
parents bd839a99 a6fc06f7

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<manifest

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:versionCode="21007"

    android:versionName="4.904" package="com.fsck.k9"

    android:versionCode="21008"

    android:versionName="4.905" package="com.fsck.k9"

    >

    <uses-sdk

       android:minSdkVersion="15"

build.gradle

+32 −0
Original line number Diff line number Diff line
@@ -5,10 +5,17 @@ buildscript { 


  dependencies {

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

    classpath 'com.jakewharton.sdkmanager:gradle-plugin:0.12.0'

  }

}



apply plugin: 'android-sdk-manager'

apply plugin: 'com.android.application'

apply plugin: 'checkstyle'



repositories {

    jcenter()

}



dependencies {

  compile project(':plugins:Android-PullToRefresh:library')
@@ -19,10 +26,25 @@ dependencies { 
  compile fileTree(dir: 'libs', include: '*.jar')

}



project.ext.preDexLibs = !project.hasProperty('disablePreDex')



subprojects {

  project.plugins.whenPluginAdded { plugin ->

    if ("com.android.build.gradle.AppPlugin".equals(plugin.class.name) ||

        "com.android.build.gradle.LibraryPlugin".equals(plugin.class.name)) {

      project.android.dexOptions.preDexLibraries = rootProject.ext.preDexLibs

    }

  }

}



android {

  compileSdkVersion 19

  buildToolsVersion '20.0.0'



  dexOptions {

    preDexLibraries = rootProject.ext.preDexLibs

  }



  sourceSets {

    main {

      manifest.srcFile 'AndroidManifest.xml'
@@ -51,6 +73,16 @@ android { 
  }

}



check.dependsOn 'checkstyle'

task checkstyle(type: Checkstyle) {

    ignoreFailures = true

    configFile file("config/checkstyle/checkstyle.xml")



    source 'src'

    include '**/*.java'

    classpath = files()

}



task testsOnJVM(type :GradleBuild, dependsOn: assemble) {

  buildFile = 'tests-on-jvm/build.gradle'

  tasks = ['test']

config/checkstyle/checkstyle.xml

0 → 100644
+149 −0
Original line number Diff line number Diff line 
<?xml version="1.0"?>

<!DOCTYPE module PUBLIC

    "-//Puppy Crawl//DTD Check Configuration 1.3//EN"

    "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">



<module name="Checker">

    <!--

        If you set the basedir property below, then all reported file

        names will be relative to the specified directory. See

        http://checkstyle.sourceforge.net/5.x/config.html#Checker



        <property name="basedir" value="${basedir}"/>

    -->



    <property name="severity" value="info"/>



    <!--

    <module name="SuppressionFilter">

        <property name="file" value="${checkstyle.suppressions.file}"/>

    </module>

    -->



    <module name="FileTabCharacter">

        <property name="eachLine" value="false"/>

    </module>



    <module name="NewlineAtEndOfFile"/>



    <module name="TreeWalker">

        <property name="tabWidth" value="4"/>



        <module name="AvoidStarImport"/>

        <module name="ConstantName">

            <property name="severity" value="warning"/>

        </module>

        <module name="EmptyBlock">

            <property name="option" value="text"/>

            <property name="tokens" value="LITERAL_CATCH"/>

            <property name="severity" value="warning"/>

        </module>

        <module name="EmptyForIteratorPad"/>

        <module name="EqualsHashCode">

            <property name="severity" value="warning"/>

        </module>

        <module name="OneStatementPerLine"/>



        <!-- module name="IllegalCatch"/ -->

        <module name="IllegalImport">

            <property name="severity" value="warning"/>

        </module>

        <module name="IllegalThrows">

            <property name="severity" value="warning"/>

        </module>

        <module name="InnerAssignment">

            <property name="severity" value="warning"/>

        </module>



        <module name="LeftCurly">

            <property name="option" value="eol"/>

        </module>



        <module name="LineLength">

            <property name="max" value="140"/>

        </module>



        <module name="LocalFinalVariableName">

            <property name="severity" value="warning"/>

        </module>

        <module name="LocalVariableName">

            <property name="severity" value="warning"/>

        </module>

        <module name="MemberName">

            <property name="severity" value="warning"/>

        </module>

        <module name="MethodName">

            <property name="severity" value="warning"/>

        </module>

        <module name="MethodParamPad"/>

        <module name="ModifierOrder"/>

        <module name="NeedBraces"/>

        <module name="NoWhitespaceAfter">

            <property name="tokens" value="BNOT"/>

            <property name="tokens" value="DEC"/>

            <property name="tokens" value="DOT"/>

            <property name="tokens" value="INC"/>

            <property name="tokens" value="LNOT"/>

            <property name="tokens" value="UNARY_MINUS"/>

            <property name="tokens" value="UNARY_PLUS"/>

        </module>



        <module name="NoWhitespaceBefore"/>

        <module name="NoWhitespaceBefore">

            <property name="tokens" value="DOT"/>

            <property name="allowLineBreaks" value="true"/>

        </module>



        <module name="PackageName">

            <property name="severity" value="warning"/>

        </module>

        <module name="ParameterName">

            <property name="severity" value="warning"/>

        </module>

        <module name="ParenPad"/>

        <module name="TypecastParenPad"/>

        <module name="RedundantImport"/>

        <module name="RedundantModifier"/>

        <module name="RightCurly">

            <property name="option" value="alone"/>

            <property name="tokens" value="LITERAL_ELSE"/>

        </module>

        <module name="SimplifyBooleanExpression"/>

        <module name="SimplifyBooleanReturn"/>

        <module name="TypeName">

            <property name="severity" value="warning"/>

        </module>

        <module name="UnusedImports"/>

        <module name="UpperEll"/>

        <module name="WhitespaceAfter"/>

        <module name="WhitespaceAround"/>

        <module name="GenericWhitespace"/>



        <!--

        <module name="MissingSwitchDefault"/>

        <module name="MagicNumber"/>

        <module name="Indentation"/>



        <module name="OperatorWrap">

            <property name="option" value="eol"/>

        </module>



        <module name="EqualsAvoidNull">

            <property name="severity" value="warning"/>

        </module>

        -->



        <module name="ParameterAssignment">

            <property name="severity" value="warning"/>

        </module>



        <module name="DefaultComesLast"/>

        <module name="MissingDeprecated"/>

        <module name="MissingOverride">

            <property name="javaFiveCompatibility" value="true"/>

        </module>

        <module name="OuterTypeFilename">

            <property name="severity" value="warning"/>

        </module>

    </module>

</module>
 
 No newline at end of file

images/feature_graphic.png

0 → 100644
+68.8 KiB
Loading image diff...