Skip to content

Commit

Permalink
Kotlin 1.6.10, Gradle 7.4, migrate to kotlin.test
Browse files Browse the repository at this point in the history
  • Loading branch information
vanniktech authored and JakeWharton committed Feb 23, 2022
1 parent 0e13685 commit 6f0122c
Show file tree
Hide file tree
Showing 20 changed files with 359 additions and 354 deletions.
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[*.{kt,kts}]
indent_size=2
continuation_indent_size=4
continuation_indent_size=2
insert_final_newline=true
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-java@v1
with:
java-version: 1.8
java-version: 11

- uses: gradle/wrapper-validation-action@v1
- run: ./gradlew build
Expand Down
36 changes: 17 additions & 19 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,48 +2,46 @@ import org.gradle.internal.jvm.Jvm

buildscript {
ext.deps = [
'junit': 'junit:junit:4.13',
'truth': 'com.google.truth:truth:1.0.1',
'crossword': 'com.jakewharton.crossword:crossword:0.1.1',
'crossword': 'com.jakewharton.crossword:crossword:0.1.1',
]

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.10"
classpath 'org.jlleitschuh.gradle:ktlint-gradle:9.1.0'
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.6.10'
classpath 'com.diffplug.spotless:spotless-plugin-gradle:6.3.0'
classpath 'ru.vyarus:gradle-animalsniffer-plugin:1.5.0'
classpath 'com.vanniktech:gradle-maven-publish-plugin:0.18.0'
}

repositories {
mavenCentral()
jcenter()
gradlePluginPortal()
}
}

subprojects {
group('com.jakewharton.picnic')
version('0.6.0-SNAPSHOT')

repositories {
mavenCentral()
jcenter()
}

apply plugin: 'org.jlleitschuh.gradle.ktlint'
ktlint {
version = '0.38.1'
disabledRules = [
'filename',
]
apply plugin: 'com.diffplug.spotless'
spotless {
kotlin {
ktlint('0.44.0').userData([
'indent_size': '2',
'continuation_indent_size': '2',
'disabled_rules': 'filename',
])
}
}

plugins.withId('org.jetbrains.kotlin.jvm') {
compileKotlin {
kotlinOptions {
jvmTarget = "1.8"
jvmTarget = '1.8'
freeCompilerArgs = [
"-progressive",
'-progressive',
'-Xjvm-default=all',
]
}
}
Expand Down
17 changes: 17 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
GROUP=com.jakewharton.picnic
VERSION_NAME=0.6.0-SNAPSHOT

POM_DESCRIPTION=An API for constructing HTML-like tables which can be rendered to text

POM_URL=https://github.com/JakeWharton/picnic/
POM_SCM_URL=https://github.com/JakeWharton/picnic/
POM_SCM_CONNECTION=scm:git:git://github.com/JakeWharton/picnic.git
POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/JakeWharton/picnic.git

POM_LICENCE_NAME=Apache-2.0
POM_LICENCE_URL=https://www.apache.org/licenses/LICENSE-2.0.txt
POM_LICENCE_DIST=repo

POM_DEVELOPER_ID=jakewharton
POM_DEVELOPER_NAME=Jake Wharton

# Publishing SHA 256 and 512 hashses of maven-metadata is not supported by Sonatype and Nexus.
# See https://github.com/gradle/gradle/issues/11308 and https://issues.sonatype.org/browse/NEXUS-21802
systemProp.org.gradle.internal.publish.checksums.insecure=true
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 6f0122c

Please sign in to comment.