Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller #25358

Merged
merged 2 commits into from
Feb 28, 2023
Merged

Add dependent lib kotlin-stdlib for kotlin version of java-matter-controller #25358

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d8809d
Add dependent lib kotlin-stdlib for kotlin version of java-matter-con…
yufengwangca Feb 27, 2023
1347b92
Update kotlin version to 1.8.10
yufengwangca Feb 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-java/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM connectedhomeip/chip-build:${VERSION}
# Download and install kotlin compiler
RUN set -x \
&& cd /usr/lib \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \
&& unzip kotlin-compiler-*.zip \
&& rm kotlin-compiler-*.zip \
&& rm -f kotlinc/bin/*.bat \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build-vscode/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN set -x \
# Download and install kotlin compiler
RUN set -x \
&& cd /usr/lib \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.3.31/kotlin-compiler-1.3.31.zip \
&& wget -q https://github.com/JetBrains/kotlin/releases/download/v1.8.10/kotlin-compiler-1.8.10.zip \
&& unzip kotlin-compiler-*.zip \
&& rm kotlin-compiler-*.zip \
&& rm -f kotlinc/bin/*.bat \
Expand Down
2 changes: 1 addition & 1 deletion integrations/docker/images/chip-build/version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.6.43 Version bump reason: Update Tizen SDK version to 7.0
0.6.44 Version bump reason: [Java] update kotlin compiler version to 1.8.10
4 changes: 4 additions & 0 deletions third_party/java_deps/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ java_prebuilt("annotation") {
java_prebuilt("json") {
jar_path = "artifacts/json-20220924.jar"
}

java_prebuilt("kotlin-stdlib") {
jar_path = "artifacts/kotlin-stdlib-1.8.10.jar"
}
1 change: 1 addition & 0 deletions third_party/java_deps/set_up_java_deps.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
mkdir -p third_party/java_deps/artifacts
curl --fail --location --silent --show-error https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar -o third_party/java_deps/artifacts/jsr305-3.0.2.jar
curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/json/json/20220924/json-20220924.jar -o third_party/java_deps/artifacts/json-20220924.jar
curl --fail --location --silent --show-error https://repo1.maven.org/maven2/org/jetbrains/kotlin/kotlin-stdlib/1.8.10/kotlin-stdlib-1.8.10.jar -o third_party/java_deps/artifacts/kotlin-stdlib-1.8.10.jar