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

Commit ae18cc64 authored by Unpublished's avatar Unpublished Committed by Marten Gajda
Browse files

Bump AGP and gradle (#796) 

* Bump AGP to 3.4.1, gradle to 5.1.1

* Fix lint error
parent b6835ea3

.idea/codeStyles/Project.xml

+0 −25
Original line number Diff line number Diff line
@@ -48,31 +48,6 @@ 
      <option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />

      <option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" />

    </JavaCodeStyleSettings>

    <Objective-C-extensions>

      <file>

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />

      </file>

      <class>

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />

        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />

      </class>

      <extensions>

        <pair source="cpp" header="h" fileNamingConvention="NONE" />

        <pair source="c" header="h" fileNamingConvention="NONE" />

      </extensions>

    </Objective-C-extensions>

    <XML>

      <option name="XML_ATTRIBUTE_WRAP" value="2" />

      <option name="XML_KEEP_LINE_BREAKS" value="false" />

build.gradle

+3 −3
Original line number Diff line number Diff line 
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {

    repositories {

        google()

        jcenter()

        mavenCentral()

        google()

    }

    dependencies {

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

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

        classpath("com.github.triplet.gradle:play-publisher:2.0.0-rc1")

    }

}
@@ -24,9 +24,9 @@ allprojects { 
    version gitVersion()



    repositories {

        google()

        jcenter()

        maven { url "https://jitpack.io" }

        google()

    }

}

gradle/wrapper/gradle-wrapper.jar

+857 B (53.9 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

gradle/wrapper/gradle-wrapper.properties

+1 −2
Original line number Diff line number Diff line 
#Thu Nov 08 02:52:41 CET 2018

distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

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

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists
 
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

gradlew

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ APP_NAME="Gradle" 
APP_BASE_NAME=`basename "$0"`



# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

DEFAULT_JVM_OPTS=""

DEFAULT_JVM_OPTS='"-Xmx64m"'



# Use the maximum available, or set MAX_FD != -1 to use that value.

MAX_FD="maximum"