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

Commit d74b68fa authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "[Spa] Update dependencies" into main

parents 25ae7c05 be090f03

packages/SettingsLib/Spa/.idea/codeStyles/Project.xml

+180 −20
Original line number Diff line number Diff line 
<component name="ProjectCodeStyleConfiguration">

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

    <JetCodeStyleSettings>

      <option name="PACKAGES_IMPORT_LAYOUT">

    <option name="RIGHT_MARGIN" value="100" />

    <JavaCodeStyleSettings>

      <option name="FIELD_NAME_PREFIX" value="m" />

      <option name="STATIC_FIELD_NAME_PREFIX" value="s" />

      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />

      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="9999" />

      <option name="IMPORT_LAYOUT_TABLE">

        <value>

          <package name="" alias="false" withSubpackages="true" />

          <package name="" alias="true" withSubpackages="true" />

          <package name="" withSubpackages="true" static="false" module="true" />

          <package name="android" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="androidx" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="com.android" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="dalvik" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="libcore" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="com" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="gov" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="junit" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="net" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="org" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="java" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="javax" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="" withSubpackages="true" static="true" />

          <emptyLine />

          <package name="android" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="androidx" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="com.android" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="dalvik" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="libcore" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="com" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="gov" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="junit" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="net" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="org" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="java" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="javax" withSubpackages="true" static="false" />

          <emptyLine />

          <package name="" withSubpackages="true" static="false" />

        </value>

      </option>

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

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

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

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

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

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

    </JavaCodeStyleSettings>

    <JetCodeStyleSettings>

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

    </JetCodeStyleSettings>

    <XML>

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

    </XML>

    <ADDITIONAL_INDENT_OPTIONS fileType="java">

      <option name="TAB_SIZE" value="8" />

    </ADDITIONAL_INDENT_OPTIONS>

    <ADDITIONAL_INDENT_OPTIONS fileType="js">

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

    </ADDITIONAL_INDENT_OPTIONS>

    <codeStyleSettings language="JAVA">

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

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

      <option name="CALL_PARAMETERS_WRAP" value="1" />

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

      <option name="METHOD_PARAMETERS_WRAP" value="1" />

      <option name="RESOURCE_LIST_WRAP" value="1" />

      <option name="EXTENDS_LIST_WRAP" value="1" />

      <option name="THROWS_LIST_WRAP" value="1" />

      <option name="THROWS_KEYWORD_WRAP" value="1" />

      <option name="BINARY_OPERATION_WRAP" value="1" />

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

      <option name="TERNARY_OPERATION_WRAP" value="1" />

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

      <option name="FOR_STATEMENT_WRAP" value="1" />

      <option name="ARRAY_INITIALIZER_WRAP" value="1" />

      <option name="ASSIGNMENT_WRAP" value="1" />

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

      <option name="IF_BRACE_FORCE" value="1" />

      <option name="DOWHILE_BRACE_FORCE" value="1" />

      <option name="WHILE_BRACE_FORCE" value="1" />

      <option name="FOR_BRACE_FORCE" value="1" />

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

    </codeStyleSettings>

    <codeStyleSettings language="JavaScript">

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

      <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />

      <option name="BLANK_LINES_AROUND_FIELD" value="1" />

      <option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />

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

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

      <option name="CALL_PARAMETERS_WRAP" value="1" />

      <option name="METHOD_PARAMETERS_WRAP" value="1" />

      <option name="EXTENDS_LIST_WRAP" value="1" />

      <option name="THROWS_LIST_WRAP" value="1" />

      <option name="EXTENDS_KEYWORD_WRAP" value="1" />

      <option name="THROWS_KEYWORD_WRAP" value="1" />

      <option name="METHOD_CALL_CHAIN_WRAP" value="1" />

      <option name="BINARY_OPERATION_WRAP" value="1" />

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

      <option name="TERNARY_OPERATION_WRAP" value="1" />

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

      <option name="FOR_STATEMENT_WRAP" value="1" />

      <option name="ARRAY_INITIALIZER_WRAP" value="1" />

      <option name="ASSIGNMENT_WRAP" value="1" />

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

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

      <option name="IF_BRACE_FORCE" value="3" />

      <option name="DOWHILE_BRACE_FORCE" value="3" />

      <option name="WHILE_BRACE_FORCE" value="3" />

      <option name="FOR_BRACE_FORCE" value="3" />

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

    </codeStyleSettings>

    <codeStyleSettings language="XML">

      <option name="FORCE_REARRANGE_MODE" value="1" />

      <indentOptions>
@@ -24,7 +143,6 @@ 
              <match>

                <AND>

                  <NAME>xmlns:android</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>
@@ -35,7 +153,6 @@ 
              <match>

                <AND>

                  <NAME>xmlns:.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>
@@ -47,7 +164,6 @@ 
              <match>

                <AND>

                  <NAME>.*:id</NAME>

                  <XML_ATTRIBUTE />

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

                </AND>

              </match>
@@ -58,7 +174,6 @@ 
              <match>

                <AND>

                  <NAME>.*:name</NAME>

                  <XML_ATTRIBUTE />

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

                </AND>

              </match>
@@ -69,7 +184,6 @@ 
              <match>

                <AND>

                  <NAME>name</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>
@@ -80,7 +194,6 @@ 
              <match>

                <AND>

                  <NAME>style</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>
@@ -91,23 +204,74 @@ 
              <match>

                <AND>

                  <NAME>.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>^$</XML_NAMESPACE>

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:layout_width</NAME>

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

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:layout_height</NAME>

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

                </AND>

              </match>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:layout_.*</NAME>

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

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:width</NAME>

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

                </AND>

              </match>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>

            <rule>

              <match>

                <AND>

                  <NAME>.*:height</NAME>

                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</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>

              <order>BY_NAME</order>

            </rule>

          </section>

          <section>
@@ -115,7 +279,6 @@ 
              <match>

                <AND>

                  <NAME>.*</NAME>

                  <XML_ATTRIBUTE />

                  <XML_NAMESPACE>.*</XML_NAMESPACE>

                </AND>

              </match>
@@ -127,9 +290,6 @@ 
    </codeStyleSettings>

    <codeStyleSettings language="kotlin">

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

      <indentOptions>

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

      </indentOptions>

    </codeStyleSettings>

  </code_scheme>

</component>
 
 No newline at end of file

packages/SettingsLib/Spa/build.gradle.kts

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ val androidTop: String = File(rootDir, "../../../../..").canonicalPath 


allprojects {

    extra["androidTop"] = androidTop

    extra["jetpackComposeVersion"] = "1.8.0"

    extra["jetpackComposeVersion"] = "1.9.0-alpha02"

}



subprojects {

packages/SettingsLib/Spa/gradle/libs.versions.toml

+5 −5
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
#



[versions]

agp = "8.9.2"

dexmaker-mockito = "2.28.3"

agp = "8.10.0"

dexmaker-mockito = "2.28.4"

jvm = "21"

kotlin = "2.1.10"

mockito-kotlin = "4.1.0"

truth = "1.4.4"

kotlin = "2.1.10" # external/kotlinc/build.txt

mockito-kotlin = "4.1.0" # external/mockito-kotlin/METADATA

truth = "1.4.4" # external/truth



[libraries]

dexmaker-mockito = { module = "com.linkedin.dexmaker:dexmaker-mockito", version.ref = "dexmaker-mockito" }

packages/SettingsLib/Spa/gradle/wrapper/gradle-8.11.1-bin.zip→packages/SettingsLib/Spa/gradle/wrapper/gradle-8.12.1-bin.zip

−355 KiB (130 MiB)

File changed and moved.

No diff preview for this file type.

View original file
View changed file

packages/SettingsLib/Spa/gradle/wrapper/gradle-wrapper.properties

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


distributionBase=GRADLE_USER_HOME

distributionPath=wrapper/dists

distributionUrl=gradle-8.11.1-bin.zip

distributionUrl=gradle-8.12.1-bin.zip

zipStoreBase=GRADLE_USER_HOME

zipStorePath=wrapper/dists