Upgrade kotlinx.serialization to v1.6.3 am: 3eabe70bae am: 0613cddefb
Original change: https://android-review.googlesource.com/c/platform/external/kotlinx.serialization/+/3058343
Change-Id: I05e5687fb427f87d78a0ebd9428608f52eaa26bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/.gitignore b/.gitignore
index c56b7b9..054cf97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,8 @@
# IntelliJ files
**/.idea/*
!/.idea/vcs.xml
+!/.idea/codeStyles
+!/.idea/copyright
out/
*.iml
@@ -15,3 +17,6 @@
# Modules for JS projects build
node_modules
+
+# benchmarks.jar
+/benchmarks.jar
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..5662cc4
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,15 @@
+<component name="ProjectCodeStyleConfiguration">
+ <code_scheme name="Project" version="173">
+ <JetCodeStyleSettings>
+ <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="1"/>
+ <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="1"/>
+ <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL"/>
+ </JetCodeStyleSettings>
+ <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
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..127f806
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+ <state>
+ <option name="USE_PER_PROJECT_SETTINGS" value="true"/>
+ </state>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/kotlinx_serialization.xml b/.idea/copyright/kotlinx_serialization.xml
new file mode 100644
index 0000000..52e9052
--- /dev/null
+++ b/.idea/copyright/kotlinx_serialization.xml
@@ -0,0 +1,6 @@
+ <component name="CopyrightManager">
+ <copyright>
+ <option name="notice" value="Copyright 2017-&#36;today.year JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license." />
+ <option name="myName" value="kotlinx.serialization" />
+ </copyright>
+</component>
\ No newline at end of file
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
new file mode 100644
index 0000000..caad99f
--- /dev/null
+++ b/.idea/copyright/profiles_settings.xml
@@ -0,0 +1,3 @@
+<component name="CopyrightManager">
+ <settings default="kotlinx.serialization" />
+</component>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index cc23b03..9dcab70 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
<project version="4">
<component name="CommitMessageInspectionProfile">
<profile version="1.0">
- <inspection_tool class="CommitMessageSpellChecking" enabled="false" level="TYPO" enabled_by_default="true" />
<inspection_tool class="GraziCommit" enabled="true" level="TYPO" enabled_by_default="true" />
<inspection_tool class="GrazieCommit" enabled="true" level="TYPO" enabled_by_default="true" />
</profile>
@@ -21,10 +20,14 @@
<option name="issueRegexp" value="#(\d+)" />
<option name="linkRegexp" value="https://github.com/Kotlin/kotlinx.serialization/issues/$1" />
</IssueNavigationLink>
+ <IssueNavigationLink>
+ <option name="issueRegexp" value="[A-Z]+\-\d+"/>
+ <option name="linkRegexp" value="http://youtrack.jetbrains.com/issue/$0"/>
+ </IssueNavigationLink>
</list>
</option>
</component>
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
-</project>
+</project>
\ No newline at end of file