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.

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

Bump Kotlin to 1.4.20 (replaces kotlin-android-extensions with kotlin… #150

Merged
merged 8 commits into from
Nov 23, 2020
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.10"
kotlin("jvm") version "1.4.20"
`kotlin-dsl`
}

Expand Down
1 change: 0 additions & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
pluginManagement {
repositories {
gradlePluginPortal()
maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/dokka/dev")
}
}
4 changes: 2 additions & 2 deletions buildSrc/src/main/kotlin/Dependencies.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
object Versions {
const val kotlin = "1.4.10"
const val kotlin = "1.4.20"
const val serialization = "1.0.1"
const val atomicfu = "0.14.4"
const val androidxTest = "1.3.0"
const val googleTruth = "1.1"
const val androidDesugarJdkLibs = "1.1.0"
const val javamath2kmp = "0.1.0"
const val javamath2kmp = "0.2.0"
}

object Libs {
Expand Down
2 changes: 1 addition & 1 deletion docs/extensions/parcelize.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#`@Parcelize`

The `parcelize-extensions` artifact provides a set of parcelers for use with the [Parcelable implementation generator](https://kotlinlang.org/docs/reference/compiler-plugins.html#parcelable-implementations-generator) in the Kotlin Android Extensions.
The `parcelize-extensions` artifact provides a set of parcelers for use with the [Parcelable implementation generator](https://kotlinlang.org/docs/reference/compiler-plugins.html#parcelable-implementations-generator) plugin.

## Gradle Setup

Expand Down
2 changes: 1 addition & 1 deletion extensions/parcelize/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
`android-library`
id("kotlin-android-extensions")
id("kotlin-parcelize")
}

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.os.Parcelable
import io.islandtime.Date
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class DateTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.os.Parcelable
import io.islandtime.DateTime
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class DateTimeTimeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package io.islandtime.extensions.parcelize
import android.os.Parcelable
import io.islandtime.Instant
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class InstantTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.os.Parcelable
import io.islandtime.*
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.measures.hours
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class OffsetDateTimeTimeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.os.Parcelable
import io.islandtime.OffsetTime
import io.islandtime.UtcOffset
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class OffsetOffsetTimeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package io.islandtime.extensions.parcelize
import android.os.Parcelable
import io.islandtime.Time
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class TimeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package io.islandtime.extensions.parcelize
import android.os.Parcelable
import io.islandtime.TimeZone
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class TimeZoneTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import android.os.Parcelable
import io.islandtime.YearMonth
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class YearMonthTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package io.islandtime.extensions.parcelize
import android.os.Parcelable
import io.islandtime.*
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.measures.Duration
import io.islandtime.measures.durationOf
import io.islandtime.measures.hours
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class DurationTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package io.islandtime.extensions.parcelize.measures
import android.os.Parcelable
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.measures.*
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class PeriodTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import io.islandtime.Date
import io.islandtime.ranges.DateRange
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class DateRangeRangeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import io.islandtime.ranges.DateTimeInterval
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.ranges.until
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class DateTimeIntervalRangeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import io.islandtime.ranges.InstantInterval
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.measures.seconds
import io.islandtime.ranges.until
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class InstantIntervalRangeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import io.islandtime.UtcOffset
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.measures.hours
import io.islandtime.ranges.until
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test

class OffsetDateTimeIntervalRangeTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import io.islandtime.ZonedDateTime
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.ranges.ZonedDateTimeInterval
import io.islandtime.ranges.until
import kotlinx.android.parcel.Parcelize
import kotlinx.android.parcel.TypeParceler
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.AfterClass
import org.junit.BeforeClass
import org.junit.Test
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.Date
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object DateParceler : Parceler<Date> {
override fun create(parcel: Parcel): Date = parcel.readDate()
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.Date
import io.islandtime.DateTime
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object DateTimeParceler : Parceler<DateTime> {
override fun create(parcel: Parcel): DateTime = parcel.readDateTime()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.Instant
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object InstantParceler : Parceler<Instant> {
override fun create(parcel: Parcel): Instant = parcel.readInstant()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import io.islandtime.DateTime
import io.islandtime.UtcOffset
import io.islandtime.OffsetDateTime
import io.islandtime.measures.seconds
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object OffsetDateTimeParceler : Parceler<OffsetDateTime> {
override fun create(parcel: Parcel): OffsetDateTime = parcel.readOffsetDateTime()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.OffsetTime
import io.islandtime.UtcOffset
import io.islandtime.measures.seconds
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object OffsetTimeParceler : Parceler<OffsetTime> {
override fun create(parcel: Parcel): OffsetTime {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.Date
import io.islandtime.Time
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object TimeParceler : Parceler<Time> {
override fun create(parcel: Parcel): Time = parcel.readTime()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.TimeZone
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object TimeZoneParceler : Parceler<TimeZone> {
override fun create(parcel: Parcel): TimeZone {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.islandtime.extensions.parcelize

import android.os.Parcel
import io.islandtime.YearMonth
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object YearMonthParceler : Parceler<YearMonth> {
override fun create(parcel: Parcel): YearMonth {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import io.islandtime.TimeZone
import io.islandtime.UtcOffset
import io.islandtime.ZonedDateTime
import io.islandtime.measures.seconds
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object ZonedDateTimeParceler : Parceler<ZonedDateTime> {
override fun create(parcel: Parcel): ZonedDateTime = parcel.readZonedDateTime()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import io.islandtime.measures.Duration
import io.islandtime.measures.durationOf
import io.islandtime.measures.nanoseconds
import io.islandtime.measures.seconds
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object DurationParceler : Parceler<Duration> {
override fun create(parcel: Parcel): Duration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package io.islandtime.extensions.parcelize.measures

import android.os.Parcel
import io.islandtime.measures.*
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object PeriodParceler : Parceler<Period> {
override fun create(parcel: Parcel): Period {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.extensions.parcelize.readDate
import io.islandtime.extensions.parcelize.writeDate
import io.islandtime.ranges.DateRange
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object DateRangeParceler: Parceler<DateRange> {
override fun create(parcel: Parcel): DateRange = DateRange(parcel.readDate(), parcel.readDate())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.extensions.parcelize.readDateTime
import io.islandtime.extensions.parcelize.writeDateTime
import io.islandtime.ranges.DateTimeInterval
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object DateTimeIntervalParceler: Parceler<DateTimeInterval> {
override fun create(parcel: Parcel): DateTimeInterval {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.extensions.parcelize.readInstant
import io.islandtime.extensions.parcelize.writeInstant
import io.islandtime.ranges.InstantInterval
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object InstantIntervalParceler: Parceler<InstantInterval> {
override fun create(parcel: Parcel): InstantInterval {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.extensions.parcelize.readOffsetDateTime
import io.islandtime.extensions.parcelize.writeOffsetDateTime
import io.islandtime.ranges.OffsetDateTimeInterval
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object OffsetDateTimeIntervalParceler: Parceler<OffsetDateTimeInterval> {
override fun create(parcel: Parcel): OffsetDateTimeInterval {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.os.Parcel
import io.islandtime.extensions.parcelize.readZonedDateTime
import io.islandtime.extensions.parcelize.writeZonedDateTime
import io.islandtime.ranges.ZonedDateTimeInterval
import kotlinx.android.parcel.Parceler
import kotlinx.parcelize.Parceler

object ZonedDateTimeIntervalParceler: Parceler<ZonedDateTimeInterval> {
override fun create(parcel: Parcel): ZonedDateTimeInterval {
Expand Down
2 changes: 1 addition & 1 deletion tools/code-generator/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.10"
kotlin("jvm") version "1.4.20"
application
}

Expand Down
5 changes: 5 additions & 0 deletions tools/code-generator/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pluginManagement {
repositories {
gradlePluginPortal()
}
}
2 changes: 1 addition & 1 deletion tools/mkdocs-dokka-plugin/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.4.10"
kotlin("jvm") version "1.4.20"
}

repositories {
Expand Down
5 changes: 5 additions & 0 deletions tools/mkdocs-dokka-plugin/settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
pluginManagement {
repositories {
gradlePluginPortal()
}
}