Page MenuHomeSolus
Files F10783632

D10712.id26496.diff
No OneTemporary
Actions

D10712.id26496.diff
View Options

diff --git a/MAINTAINERS.md b/MAINTAINERS.md
new file mode 100644
--- /dev/null
+++ b/MAINTAINERS.md
@@ -0,0 +1,5 @@
+This file is used to indicate responsibility for the maintenance of this package. Individuals on this list should be the sole modifiers of the package, excluding cases where the Solus Team may need to perform necessary rebuilds, upgrades, or security fixes. This list should not be used for any direct contact usage. If you believe this package requires a package update, follow documentation from https://getsol.us/articles/packaging/request-a-package-update/en/. In the event this package no longer becomes sufficiently maintained, Core Team reserves the right to request a new maintainer or remove this package from the repository.
+
+- Campbell Jones
+ - IRC: serebit
+ - Email: dev@serebit.com
diff --git a/files/fix-resolution-ambiguity-with-gradle-6-8.patch b/files/fix-resolution-ambiguity-with-gradle-6-8.patch
new file mode 100644
--- /dev/null
+++ b/files/fix-resolution-ambiguity-with-gradle-6-8.patch
@@ -0,0 +1,45 @@
+From 946e0bbffd6d5c5b39ae03f2c3175f2bb785ed97 Mon Sep 17 00:00:00 2001
+From: Campbell Jones <git@serebit.com>
+Date: Fri, 19 Mar 2021 10:01:51 -0400
+Subject: [PATCH 1/2] Fix build error with Gradle 6.8
+
+---
+ gradle/jps.gradle.kts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gradle/jps.gradle.kts b/gradle/jps.gradle.kts
+index ae68ee418449..e89b34b4a20e 100644
+--- a/gradle/jps.gradle.kts
++++ b/gradle/jps.gradle.kts
+@@ -480,7 +480,7 @@ fun RecursiveArtifact.jarContentsFromConfiguration(configuration: Configuration)
+
+ resolvedArtifacts.filter { it.id.componentIdentifier is ModuleComponentIdentifier }
+ .map { it.file }
+- .forEach(::extractedDirectory)
++ .forEach { extractedDirectory(it) }
+
+ resolvedArtifacts
+ .map { it.id.componentIdentifier }
+
+From 5deb1be69bc30552348741e966077777afb0b31c Mon Sep 17 00:00:00 2001
+From: Campbell Jones <git@serebit.com>
+Date: Fri, 19 Mar 2021 10:10:36 -0400
+Subject: [PATCH 2/2] Fix additional resolution ambiguity error
+
+---
+ prepare/idea-plugin/build.gradle.kts | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prepare/idea-plugin/build.gradle.kts b/prepare/idea-plugin/build.gradle.kts
+index 7cb552afaaa8..a5cf3cbc4e97 100644
+--- a/prepare/idea-plugin/build.gradle.kts
++++ b/prepare/idea-plugin/build.gradle.kts
+@@ -202,7 +202,7 @@ dependencies {
+
+ (libraries.dependencies + gradleToolingModel.dependencies)
+ .map { if (it is ProjectDependency) it.dependencyProject else it }
+- .forEach(::compile)
++ .forEach { compile(it) }
+ }
+
+ val jar = runtimeJar {
diff --git a/files/java-shim.txt b/files/java-shim.txt
new file mode 100644
--- /dev/null
+++ b/files/java-shim.txt
@@ -0,0 +1,4 @@
+if [ -z "$JAVA_HOME" ]; then
+ export JAVA_HOME=/usr/lib64/openjdk-11
+fi
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,34 +1,48 @@
name : kotlin
-version : 1.2.31
-release : 1
-source:
- - https://github.com/JetBrains/kotlin/archive/v1.2.31.tar.gz : 5b0ffdbb84c32fc22cc8e01fa029118edae6196f0c3b77bf459fb81de4cea1d2
+version : 1.5.0
+release : 2
+source :
+ - https://github.com/JetBrains/kotlin/archive/refs/tags/v1.5.0.tar.gz : 8ad403d161138df39f26f39c546c8e55c3366d73e86ba67ec8fe00d920e69c11
license : Apache-2.0
component : programming
-summary : Multiplatform programming language
+homepage : https://kotlinlang.org/
+summary : Statically typed multiplatform programming language
description: |
- Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
-builddeps :
- - openjdk-8
- - apache-ant
-rundeps :
+ Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
+builddeps :
- openjdk-8
+ - gradle
+rundeps :
+ - openjdk-11
networking : yes
setup : |
- echo "
- JAVA_HOME=/usr/lib64/openjdk-8
- JDK_16=/usr/lib64/openjdk-8
- JDK_17=/usr/lib64/openjdk-8
- JDK_18=/usr/lib64/openjdk-8
- " >> gradle.properties
- ant -f update_dependencies.xml
-build: |
- export GRADLE_USER_HOME=$HOME
- ./gradlew dist
-install: |
- mkdir -p $installdir/usr/share/kotlin/bin $installdir/usr/share/kotlin/lib
- find dist/kotlinc/bin -not -name "*.bat" -exec install -Dm777 {} $installdir/usr/share/kotlin/bin \;
- install -D -m 00777 dist/kotlinc/lib/* $installdir/usr/share/kotlin/lib
- echo %version% > $installdir/usr/share/kotlin/build.txt
- mkdir $installdir/usr/bin
- find $installdir/usr/share/kotlin/bin -type f -not -name "*.bat" -exec sh -c 'ln -sf /usr/share/kotlin/bin/$(basename {}) $installdir/usr/bin/' \;
+ %patch -p1 < $pkgfiles/fix-resolution-ambiguity-with-gradle-6-8.patch
+ rm -f $workdir/gradle/verification-metadata*.xml
+build : |
+ export GRADLE_USER_HOME=$workdir/.gradle_home
+ export JAVA_HOME="/usr/lib64/openjdk-11"
+ export JDK_16="/usr/lib64/openjdk-8"
+ export JDK_17="/usr/lib64/openjdk-8"
+ export JDK_18="/usr/lib64/openjdk-8"
+ export JDK_9="/usr/lib64/openjdk-11"
+
+ gradle dist \
+ --no-daemon \
+ --parallel \
+ --stacktrace \
+ -PdeployVersion="%version%" \
+ -Pteamcity=true
+install : |
+ install -dm 00644 $installdir/usr/share/kotlin/lib
+ install -Dm 00644 $workdir/dist/kotlinc/lib/* $installdir/usr/share/kotlin/lib
+
+ rm $workdir/dist/kotlinc/bin/*.bat
+
+ install -dm 00755 $installdir/usr/share/kotlin/bin
+ install -Dm 00755 $workdir/dist/kotlinc/bin/* $installdir/usr/share/kotlin/bin
+ sed -i "11r $pkgfiles/java-shim.txt" $installdir/usr/share/kotlin/bin/kotlinc
+
+ install -dm 00755 $installdir/usr/bin
+ for FILE in $(basename -a $installdir/usr/share/kotlin/bin/*); do
+ ln -s /usr/share/kotlin/bin/$FILE $installdir/usr/bin/$FILE
+ done
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -1,35 +1,100 @@
<PISI>
<Source>
<Name>kotlin</Name>
+ <Homepage>https://kotlinlang.org/</Homepage>
<Packager>
<Name>Campbell Jones</Name>
- <Email>contact@serebit.com</Email>
+ <Email>dev@serebit.com</Email>
</Packager>
<License>Apache-2.0</License>
<PartOf>programming</PartOf>
- <Summary xml:lang="en">Multiplatform programming language</Summary>
- <Description xml:lang="en">Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
+ <Summary xml:lang="en">Statically typed multiplatform programming language</Summary>
+ <Description xml:lang="en">Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
</Description>
- <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://getsol.us/sources/README.Solus</Archive>
</Source>
<Package>
<Name>kotlin</Name>
- <Summary xml:lang="en">Multiplatform programming language</Summary>
- <Description xml:lang="en">Kotlin is a statically-typed programming language by JetBrains that runs on the Java virtual machine and also can be transpiled to JavaScript or compiled to native binaries via LLVM.
+ <Summary xml:lang="en">Statically typed multiplatform programming language</Summary>
+ <Description xml:lang="en">Kotlin is a modern, concise, and safe programming language by JetBrains. It can run on the Java virtual machine, can be transpiled to JavaScript, and can be compiled to native binaries via LLVM. This package contains the JVM and JS compilers.
</Description>
<PartOf>programming</PartOf>
<Files>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="data">/usr/share/kotlin</Path>
+ <Path fileType="executable">/usr/bin/kapt</Path>
+ <Path fileType="executable">/usr/bin/kotlin</Path>
+ <Path fileType="executable">/usr/bin/kotlin-dce-js</Path>
+ <Path fileType="executable">/usr/bin/kotlinc</Path>
+ <Path fileType="executable">/usr/bin/kotlinc-js</Path>
+ <Path fileType="executable">/usr/bin/kotlinc-jvm</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kapt</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kotlin</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kotlin-dce-js</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kotlinc</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kotlinc-js</Path>
+ <Path fileType="data">/usr/share/kotlin/bin/kotlinc-jvm</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/allopen-compiler-plugin.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/android-extensions-compiler.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/android-extensions-runtime.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/annotations-13.0.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/js.engines.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/jvm-abi-gen.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing-cli.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing-runtime.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotation-processing.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotations-jvm-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-annotations-jvm.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-ant.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-compiler.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-daemon-client.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-daemon.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-imports-dumper-compiler-plugin.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-main-kts.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-preloader.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-reflect-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-reflect.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-runner.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-script-runtime-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-script-runtime.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-common.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-compiler-impl.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-compiler.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-js.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-scripting-jvm.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk7-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk7.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk8-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-jdk8.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-js-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-js.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-stdlib.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-js-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-js.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit5-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-junit5.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-testng-sources.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test-testng.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlin-test.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlinx-coroutines-core.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/kotlinx-serialization-compiler-plugin.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/mutability-annotations-compat.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/noarg-compiler-plugin.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/parcelize-compiler.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/parcelize-runtime.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/sam-with-receiver-compiler-plugin.jar</Path>
+ <Path fileType="data">/usr/share/kotlin/lib/trove4j.jar</Path>
</Files>
</Package>
<History>
- <Update release="1">
- <Date>2018-03-25</Date>
- <Version>1.2.31</Version>
+ <Update release="2">
+ <Date>2021-05-05</Date>
+ <Version>1.5.0</Version>
<Comment>Packaging update</Comment>
<Name>Campbell Jones</Name>
- <Email>contact@serebit.com</Email>
+ <Email>dev@serebit.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file

File Metadata

Mime Type
text/plain
Expires
May 26 2023, 9:05 PM (11 w, 2 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5807135
Default Alt Text
D10712.id26496.diff (14 KB)

Event Timeline

Copyright © 2015-2021 Solus Project. The Solus logo is Copyright © 2016-2021 Solus Project. All Rights Reserved.