Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,7 @@ indent_size = 2

[*.md]
trim_trailing_whitespace = false

[*.{kt,kts}]
ktlint_code_style = intellij_idea
ktlint_standard_import-ordering = disabled
15 changes: 8 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v2.3.4
uses: actions/checkout@v4

- name: Check Gradle wrapper
uses: gradle/wrapper-validation-action@v1.0.3
uses: gradle/actions/wrapper-validation@v4

- name: Set up JDK 1.8
uses: actions/setup-java@v1.4.3
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: 1.8
distribution: temurin
java-version: 17

- name: Set up Gradle Cache
uses: actions/cache@v2.1.3
uses: actions/cache@v4
with:
path: ~/.gradle
key: ${{ runner.OS }}-gradle-
Expand All @@ -28,7 +29,7 @@ jobs:
run: ./gradlew ktlintCheck detekt build

- name: Store reports
uses: actions/upload-artifact@v2.2.1
uses: actions/upload-artifact@v4
if: always()
with:
name: Reports
Expand Down
15 changes: 3 additions & 12 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,16 @@ buildscript {
}

plugins {
id "org.jetbrains.kotlin.jvm"
id "org.jetbrains.kotlin.kapt"
id "org.jetbrains.dokka"

id "com.github.ben-manes.versions"
id "org.jetbrains.kotlin.jvm" apply false
id "com.google.devtools.ksp" apply false
}

allprojects {
version = rootProject.ext.version
group = rootProject.ext.group

repositories {
jcenter()
}
}

tasks.named("dependencyUpdates").configure {
rejectVersionIf {
!(it.candidate.version ==~ /^[0-9,.v-]+(-r)?$/)
mavenCentral()
}
}

Expand Down
6 changes: 1 addition & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
org.gradle.jvmargs=-Xmx2048M -XX:MaxPermSize=512m -XX:MaxHeapSize=1024M -Dfile.encoding=UTF-8
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
org.gradle.parallel=true
org.gradle.caching=true

kotlin.code.style=official

kapt.use.worker.api=true
kapt.incremental.apt=true
kapt.include.compile.classpath=false
7 changes: 4 additions & 3 deletions gradle/dependencies.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
dependencies {
api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlinVersion"
api "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"

api "com.squareup.retrofit2:retrofit:$retrofitVersion"
api "com.squareup.retrofit2:converter-moshi:$retrofitVersion"
Expand All @@ -12,13 +12,14 @@ dependencies {

runtimeOnly "com.squareup.okio:okio:$okioVersion"

kapt "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
kaptTest "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
ksp "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"
kspTest "com.squareup.moshi:moshi-kotlin-codegen:$moshiVersion"

testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinCoroutinesVersion"

testImplementation "org.junit.jupiter:junit-jupiter:$junitVersion"
testImplementation "org.junit.jupiter:junit-jupiter-params:$junitVersion"
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

testImplementation "net.jodah:concurrentunit:$concurrentUnitVersion"
testImplementation "org.amshove.kluent:kluent:$kluentVersion"
Expand Down
35 changes: 16 additions & 19 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
@@ -1,29 +1,26 @@
ext {
version = "5.4.0"
version = "5.5.0"
group = "com.github.proxer"

gradleVersion = "6.7.1"
gradleVersion = "9.8.1"

kotlinVersion = "1.4.21"
kotlinCoroutinesVersion = "1.4.2"
dokkaVersion = "1.4.20"
kotlinVersion = "2.3.21"
kspVersion = "2.3.12"
kotlinCoroutinesVersion = "1.10.2"

jacocoVersion = "0.8.6"
ktlintPluginVersion = "9.4.1"
ktlintVersion = "0.40.0"
detektVersion = "1.15.0"
jacocoVersion = "0.8.12"
ktlintPluginVersion = "14.2.0"
ktlintVersion = "1.5.0"
detektVersion = "1.23.8"

gradleVersionsPluginVersion = "0.36.0"
buildConfigPluginVersion = "1.1.8"

retrofitVersion = "2.9.0"
okHttpVersion = "4.9.0"
okioVersion = "2.9.0"
moshiVersion = "1.11.0"
retrofitVersion = "2.11.0"
okHttpVersion = "4.12.0"
okioVersion = "3.9.1"
moshiVersion = "1.15.2"
moshiLazyAdaptersVersion = "2.2"

junitVersion = "5.7.0"
junitVersion = "5.11.4"
concurrentUnitVersion = "0.4.6"
kluentVersion = "1.64"
mockkVersion = "1.10.3-jdk8"
kluentVersion = "1.73"
mockkVersion = "1.13.16"
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading