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

Commit 5c536cff authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '000-main-update_deps' into 'master' 

Update gradle deps for pwa player

See merge request !4
parents ef03c44e e1cef368

.gitignore

+2 −6
Original line number Diff line number Diff line 
*.iml

.gradle

/local.properties

/.idea/caches

/.idea/libraries

/.idea/modules.xml

/.idea/workspace.xml

/.idea/navEditor.xml

/.idea/assetWizardSettings.xml

/.idea

/.kotlin

.DS_Store

/build

/captures

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line 
image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:legacy"

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:java21"



stages:

- build

.idea/.name

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
PWA Player
 
 No newline at end of file

.idea/codeStyles/Project.xml

deleted100644 → 0
+0 −122
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

  <code_scheme name="Project" version="173">

    <JetCodeStyleSettings>

      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

    </JetCodeStyleSettings>

    <codeStyleSettings language="XML">

      <indentOptions>

        <option name="CONTINUATION_INDENT_SIZE" value="4" />

      </indentOptions>

      <arrangement>

        <rules>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>xmlns:android</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>xmlns:.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:id</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:name</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>name</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>style</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>

                </AND>

              </match>

              <order>ANDROID_ATTRIBUTE_ORDER</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>.*</XML_NAMESPACE>

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

        </rules>

      </arrangement>

    </codeStyleSettings>

    <codeStyleSettings language="kotlin">

      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />

    </codeStyleSettings>

  </code_scheme>

</component>
 
 No newline at end of file

.idea/codeStyles/codeStyleConfig.xml

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

  <state>

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

  </state>

</component>
 
 No newline at end of file