diff --git a/.idea/libraries/layoutinspector_proto.xml b/.idea/libraries/layoutinspector_proto.xml index 826171141219..c69e5a2db999 100644 --- a/.idea/libraries/layoutinspector_proto.xml +++ b/.idea/libraries/layoutinspector_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml b/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml index fbe2b446c8ff..b54c3339ed61 100644 --- a/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml +++ b/.idea/libraries/org_jetbrains_intellij_deps_android_tools_base_templates.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/perfetto_proto.xml b/.idea/libraries/perfetto_proto.xml index 537dcca7fb34..765ebbacd112 100644 --- a/.idea/libraries/perfetto_proto.xml +++ b/.idea/libraries/perfetto_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/studio_grpc.xml b/.idea/libraries/studio_grpc.xml index 3a99fdd8d47a..23aa7b64b0e0 100644 --- a/.idea/libraries/studio_grpc.xml +++ b/.idea/libraries/studio_grpc.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/studio_proto.xml b/.idea/libraries/studio_proto.xml index 960a7da851e5..41c7ddf00350 100644 --- a/.idea/libraries/studio_proto.xml +++ b/.idea/libraries/studio_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/.idea/libraries/transport_proto.xml b/.idea/libraries/transport_proto.xml index 81b3fe9bd394..dae22f48bf50 100644 --- a/.idea/libraries/transport_proto.xml +++ b/.idea/libraries/transport_proto.xml @@ -1,8 +1,8 @@ - + - + diff --git a/build/dependencies/setupAndroidSdk.gradle b/build/dependencies/setupAndroidSdk.gradle index 2af603201015..ee59c5cf4a3e 100644 --- a/build/dependencies/setupAndroidSdk.gradle +++ b/build/dependencies/setupAndroidSdk.gradle @@ -47,7 +47,7 @@ if (kotlinVersionLen == -1) { } ext.kotlin_version = kotlinPluginBuild.substring(0, kotlinVersionLen) -ext.android_m2_version = "26.6.0.2" +ext.android_m2_version = "26.6.0.3" ext.android_sdk_version = "${osFamily}.3.6.0.0" dependencies { diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index 0f062bb9acec..a9acb7d39230 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -99,7 +99,7 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties { "plugins/xpath/lib/rt/xslt-rt.jar" : "1.6", "plugins/xslt-debugger/lib/xslt-debugger-rt.jar" : "1.6", "plugins/xslt-debugger/lib/rt/xslt-debugger-impl-rt.jar" : "1.8", - "plugins/android/lib/layoutlib-jre11-26.6.0.2.jar" : "9", + "plugins/android/lib/layoutlib-jre11-26.6.0.3.jar" : "9", "plugins/android/lib/android-rt.jar" : "1.8", ] diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy index 9d5bd66b06f3..4ed8d0a564bd 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy @@ -67,7 +67,7 @@ class CommunityLibraryLicenses { url: "http://source.android.com/"), new LibraryLicense(name: "Android Layout Inspector", libraryName: "precompiled-layoutinspector", license: "Apache 2.0", url: "http://source.android.com/"), - new LibraryLicense(name: "Android Layout Library", libraryName: "layoutlib-jre11-26.6.0.2.jar", license: "Apache 2.0", url: "http://source.android.com/"), + new LibraryLicense(name: "Android Layout Library", libraryName: "layoutlib-jre11-26.6.0.3.jar", license: "Apache 2.0", url: "http://source.android.com/"), new LibraryLicense(name: "Android libwebp library", libraryName: "libwebp.jar", license: "Apache 2.0", url: "https://github.com/webmproject/libwebp"), new LibraryLicense(name: "Android Lint Api", libraryName: "precompiled-lint-api", license: "Apache 2.0", diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy index dd036c191374..60f546c8aa65 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/CommunityRepositoryModules.groovy @@ -317,7 +317,7 @@ class CommunityRepositoryModules { // from AOSP's plugin("intellij.android.layoutlib"). Force layoutlib-standard. // withModuleLibrary("precompiled-layoutlib-api", "android.sdktools.layoutlib-api", "") - withModuleLibrary("layoutlib-jre11-26.6.0.2.jar", "intellij.android.layoutlib", "") + withModuleLibrary("layoutlib-jre11-26.6.0.3.jar", "intellij.android.layoutlib", "") ////////////////////////////////////////////////////// withModuleLibrary("precompiled-manifest-merger", "android.sdktools.manifest-merger", "")