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

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

Merge "Upgrade SpaLib AGP to 8.0.0-beta01" into udc-dev

parents 2350a1d1 22edba9c

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

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

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

    <JetCodeStyleSettings>

      <option name="PACKAGES_TO_USE_STAR_IMPORTS">

        <value />

      </option>

      <option name="PACKAGES_IMPORT_LAYOUT">

        <value>

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

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

        </value>

      </option>

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />

      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />

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

    </JetCodeStyleSettings>

    <XML>

packages/SettingsLib/Spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ buildscript { 
    }

}

plugins {

    id 'com.android.application' version '7.3.1' apply false

    id 'com.android.library' version '7.3.1' apply false

    id 'com.android.application' version '8.0.0-beta01' apply false

    id 'com.android.library' version '8.0.0-beta01' apply false

    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false

}

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

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


#Thu Jul 14 10:36:06 CST 2022

distributionBase=GRADLE_USER_HOME

distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip

distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-rc-1-bin.zip

distributionPath=wrapper/dists

zipStorePath=wrapper/dists

zipStoreBase=GRADLE_USER_HOME