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

Commit 444bd167 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '1066-Update_with_upstream' into 'master' 

1066-Update_with_upstream

See merge request !27
parents ac62786d 5cd64504

.idea/assetWizardSettings.xml

0 → 100644
+46 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="WizardSettings">

    <option name="children">

      <map>

        <entry key="vectorWizard">

          <value>

            <PersistentState>

              <option name="children">

                <map>

                  <entry key="vectorAssetStep">

                    <value>

                      <PersistentState>

                        <option name="children">

                          <map>

                            <entry key="clipartAsset">

                              <value>

                                <PersistentState>

                                  <option name="values">

                                    <map>

                                      <entry key="url" value="file:$USER_HOME$/Android/Sdk/icons/material/materialicons/format_list_bulleted/baseline_format_list_bulleted_24.xml" />

                                    </map>

                                  </option>

                                </PersistentState>

                              </value>

                            </entry>

                          </map>

                        </option>

                        <option name="values">

                          <map>

                            <entry key="outputName" value="ic_list_24" />

                            <entry key="sourceFile" value="$USER_HOME$/Downloads/progress_check_icon_135275.svg" />

                          </map>

                        </option>

                      </PersistentState>

                    </value>

                  </entry>

                </map>

              </option>

            </PersistentState>

          </value>

        </entry>

      </map>

    </option>

  </component>

</project>
 
 No newline at end of file

.idea/codeStyles/Project.xml

+0 −1
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
    <XML>

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

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

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

    </XML>

    <codeStyleSettings language="JAVA">

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

.idea/jarRepositories.xml

+5 −0
Original line number Diff line number Diff line
@@ -26,5 +26,10 @@ 
      <option name="name" value="Google" />

      <option name="url" value="https://dl.google.com/dl/android/maven2/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="maven2" />

      <option name="name" value="maven2" />

      <option name="url" value="https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven" />

    </remote-repository>

  </component>

</project>
 
 No newline at end of file

.travis.yml

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ android: 
    - tools

    - build-tools-28.0.3

    - build-tools-29.0.2

    - build-tools-29.0.3

    - android-24

    - android-28

    - android-29

build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ buildscript { 
        mavenCentral()

    }

    dependencies {

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

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

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

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

    }

}