erik/bitly-shorten
erik/bitly-shorten
1
1
Fork 0
Code Issues Releases Activity

Bumped Kotlin to version 1.9.24

Browse source
This commit is contained in:
Erik C. Thauvin 2024-05-10 00:11:22 -07:00
parent 4c5a5d4ad4
commit db4eefd42c
Signed by: erik
GPG key ID: 776702A6A2DA330E
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/bld/lib/bld/bld-wrapper.properties
View file

@ -1,6 +1,6 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1 bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation= bld.downloadLocation=
bld.sourceDirectories= bld.sourceDirectories=

2
examples/gradle/build.gradle.kts
View file

@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
plugins { plugins {
id("application") id("application")
id("com.github.ben-manes.versions") version "0.51.0" id("com.github.ben-manes.versions") version "0.51.0"
kotlin("jvm") version "1.9.22" kotlin("jvm") version "1.9.24"
} }
// ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA' // ./gradlew run --args='https://erik.thauvin.net/ https://bit.ly/2PsNMAA'

2
lib/bld/bld-wrapper.properties
View file

@ -1,8 +1,8 @@
bld.downloadExtensionJavadoc=false bld.downloadExtensionJavadoc=false
bld.downloadExtensionSources=true bld.downloadExtensionSources=true
bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3 bld.extension-jacoco=com.uwyn.rife2:bld-jacoco-report:0.9.3
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.1
bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.2 bld.extension-detekt=com.uwyn.rife2:bld-detekt:0.9.2
bld.extensions=com.uwyn.rife2:bld-kotlin:0.9.4
bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES bld.repositories=MAVEN_LOCAL,MAVEN_CENTRAL,RIFE2_SNAPSHOTS,RIFE2_RELEASES
bld.downloadLocation= bld.downloadLocation=
bld.sourceDirectories= bld.sourceDirectories=

6
pom.xml
View file

@ -18,19 +18,19 @@
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId> <artifactId>kotlin-stdlib</artifactId>
<version>1.9.22</version> <version>1.9.24</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId> <artifactId>kotlin-stdlib-common</artifactId>
<version>1.9.22</version> <version>1.9.24</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jetbrains.kotlin</groupId> <groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId> <artifactId>kotlin-stdlib-jdk8</artifactId>
<version>1.9.22</version> <version>1.9.24</version>
<scope>compile</scope> <scope>compile</scope>
</dependency> </dependency>
<dependency> <dependency>

10
src/bld/java/net/thauvin/erik/bitly/BitlyShortenBuild.java
View file

@ -56,6 +56,7 @@ import static rife.bld.dependencies.Scope.compile;
import static rife.bld.dependencies.Scope.test; import static rife.bld.dependencies.Scope.test;
public class BitlyShortenBuild extends Project { public class BitlyShortenBuild extends Project {
final File srcMainKotlin = new File(srcMainDirectory(), "kotlin");
public BitlyShortenBuild() { public BitlyShortenBuild() {
pkg = "net.thauvin.erik"; pkg = "net.thauvin.erik";
name = "bitly-shorten"; name = "bitly-shorten";
@ -67,7 +68,7 @@ public class BitlyShortenBuild extends Project {
repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL); repositories = List.of(MAVEN_LOCAL, MAVEN_CENTRAL);
var okHttp = version(4, 12, 0); var okHttp = version(4, 12, 0);
final var kotlin = version(1, 9, 22); final var kotlin = version(1, 9, 24);
scope(compile) scope(compile)
// Kotlin // Kotlin
.include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin)) .include(dependency("org.jetbrains.kotlin", "kotlin-stdlib", kotlin))
@ -115,7 +116,7 @@ public class BitlyShortenBuild extends Project {
.signKey(property("sign.key")) .signKey(property("sign.key"))
.signPassphrase(property("sign.passphrase")); .signPassphrase(property("sign.passphrase"));
jarSourcesOperation().sourceDirectories(new File(srcMainDirectory(), "kotlin")); jarSourcesOperation().sourceDirectories(srcMainKotlin);
} }
public static void main(String[] args) { public static void main(String[] args) {
@ -149,7 +150,6 @@ public class BitlyShortenBuild extends Project {
@BuildCommand(summary = "Generates documentation in HTML format") @BuildCommand(summary = "Generates documentation in HTML format")
public void docs() throws ExitStatusException, IOException, InterruptedException { public void docs() throws ExitStatusException, IOException, InterruptedException {
var kotlin = new File(srcMainDirectory(), "kotlin").getAbsolutePath();
new DokkaOperation() new DokkaOperation()
.fromProject(this) .fromProject(this)
.loggingLevel(LoggingLevel.INFO) .loggingLevel(LoggingLevel.INFO)
@ -159,8 +159,8 @@ public class BitlyShortenBuild extends Project {
.outputFormat(OutputFormat.HTML) .outputFormat(OutputFormat.HTML)
.sourceSet( .sourceSet(
new SourceSet() new SourceSet()
.src(kotlin) .src(srcMainKotlin.getAbsolutePath())
.srcLink(kotlin, "https://github.com/ethauvin/" + name + .srcLink(srcMainKotlin.getAbsolutePath(), "https://github.com/ethauvin/" + name +
"/tree/master/src/main/kotlin/", "#L") "/tree/master/src/main/kotlin/", "#L")
.includes("config/dokka/packages.md") .includes("config/dokka/packages.md")
.jdkVersion(javaRelease) .jdkVersion(javaRelease)