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.

Sign up for GitHub

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

Jump to bottom

Rearrange parcelize package structure #172

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Rearrange parcelize package structure #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e383480
Rearrange serializer package structure
erikc5000 Mar 2, 2021
17abcd5
Fix compile errors
erikc5000 Mar 2, 2021
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: 2 additions & 2 deletions ...ensions/parcelize/ranges/DateRangeTest.kt → ...e/src/androidTest/kotlin/DateRangeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.Date
import io.islandtime.ranges.DateRange
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...landtime/extensions/parcelize/DateTest.kt → ...celize/src/androidTest/kotlin/DateTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.Date
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions .../parcelize/ranges/DateTimeIntervalTest.kt → ...ndroidTest/kotlin/DateTimeIntervalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.DateTime
import io.islandtime.ranges.DateTimeInterval
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.ranges.until
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
Expand Down
4 changes: 2 additions & 2 deletions ...time/extensions/parcelize/DateTimeTest.kt → ...ze/src/androidTest/kotlin/DateTimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.DateTime
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...nsions/parcelize/measures/DurationTest.kt → ...ze/src/androidTest/kotlin/DurationTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.islandtime.extensions.parcelize.measures
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.measures.Duration
import io.islandtime.measures.durationOf
import io.islandtime.measures.hours
Expand Down
4 changes: 2 additions & 2 deletions ...s/parcelize/ranges/InstantIntervalTest.kt → ...androidTest/kotlin/InstantIntervalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.Instant
import io.islandtime.ranges.InstantInterval
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.measures.seconds
import io.islandtime.ranges.until
import kotlinx.parcelize.Parcelize
Expand Down
4 changes: 2 additions & 2 deletions ...dtime/extensions/parcelize/InstantTest.kt → ...ize/src/androidTest/kotlin/InstantTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.Instant
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...lize/ranges/OffsetDateTimeIntervalTest.kt → ...Test/kotlin/OffsetDateTimeIntervalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.OffsetDateTime
import io.islandtime.ranges.OffsetDateTimeInterval
import io.islandtime.UtcOffset
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.measures.hours
import io.islandtime.ranges.until
import kotlinx.parcelize.Parcelize
Expand Down
4 changes: 2 additions & 2 deletions ...xtensions/parcelize/OffsetDateTimeTest.kt → .../androidTest/kotlin/OffsetDateTimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.*
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.measures.hours
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
Expand Down
4 changes: 2 additions & 2 deletions ...me/extensions/parcelize/OffsetTimeTest.kt → .../src/androidTest/kotlin/OffsetTimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.OffsetTime
import io.islandtime.UtcOffset
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...tensions/parcelize/measures/PeriodTest.kt → ...lize/src/androidTest/kotlin/PeriodTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package io.islandtime.extensions.parcelize.measures
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.measures.*
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
Expand Down
4 changes: 2 additions & 2 deletions ...landtime/extensions/parcelize/TimeTest.kt → ...celize/src/androidTest/kotlin/TimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.Time
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...time/extensions/parcelize/TimeZoneTest.kt → ...ze/src/androidTest/kotlin/TimeZoneTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.TimeZone
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...ime/extensions/parcelize/YearMonthTest.kt → ...e/src/androidTest/kotlin/YearMonthTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.YearMonth
import io.islandtime.Month
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.Test
Expand Down
4 changes: 2 additions & 2 deletions ...elize/ranges/ZonedDateTimeIntervalTest.kt → ...dTest/kotlin/ZonedDateTimeIntervalTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.IslandTime
import io.islandtime.TimeZone
import io.islandtime.ZonedDateTime
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import io.islandtime.ranges.ZonedDateTimeInterval
import io.islandtime.ranges.until
import kotlinx.parcelize.Parcelize
Expand Down
4 changes: 2 additions & 2 deletions ...extensions/parcelize/ZonedDateTimeTest.kt → ...c/androidTest/kotlin/ZonedDateTimeTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcelable
import io.islandtime.*
import io.islandtime.extensions.parcelize.test.testParcelable
import io.islandtime.parcelize.test.testParcelable
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.TypeParceler
import org.junit.AfterClass
Expand Down
2 changes: 1 addition & 1 deletion ...tensions/parcelize/test/TestParcelable.kt → ...androidTest/kotlin/test/TestParcelable.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize.test
package io.islandtime.parcelize.test

import android.os.Bundle
import android.os.Parcel
Expand Down
2 changes: 1 addition & 1 deletion extensions/parcelize/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<manifest package="io.islandtime.extensions.parcelize">
<manifest package="io.islandtime.parcelize">
<application/>
</manifest>
2 changes: 1 addition & 1 deletion ...o/islandtime/extensions/parcelize/Date.kt → extensions/parcelize/src/main/kotlin/Date.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.Date
Expand Down
6 changes: 2 additions & 4 deletions .../extensions/parcelize/ranges/DateRange.kt → ...ns/parcelize/src/main/kotlin/DateRange.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.extensions.parcelize.readDate
import io.islandtime.extensions.parcelize.writeDate
import io.islandtime.ranges.DateRange
import kotlinx.parcelize.Parceler

object DateRangeParceler: Parceler<DateRange> {
object DateRangeParceler : Parceler<DateRange> {
override fun create(parcel: Parcel): DateRange = DateRange(parcel.readDate(), parcel.readDate())

override fun DateRange.write(parcel: Parcel, flags: Int) {
Expand Down
2 changes: 1 addition & 1 deletion ...landtime/extensions/parcelize/DateTime.kt → ...ons/parcelize/src/main/kotlin/DateTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.DateTime
Expand Down
4 changes: 1 addition & 3 deletions ...ions/parcelize/ranges/DateTimeInterval.kt → ...elize/src/main/kotlin/DateTimeInterval.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.extensions.parcelize.readDateTime
import io.islandtime.extensions.parcelize.writeDateTime
import io.islandtime.ranges.DateTimeInterval
import kotlinx.parcelize.Parceler

Expand Down
2 changes: 1 addition & 1 deletion ...extensions/parcelize/measures/Duration.kt → ...ons/parcelize/src/main/kotlin/Duration.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize.measures
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.measures.Duration
Expand Down
2 changes: 1 addition & 1 deletion ...slandtime/extensions/parcelize/Instant.kt → ...ions/parcelize/src/main/kotlin/Instant.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.Instant
Expand Down
6 changes: 2 additions & 4 deletions ...sions/parcelize/ranges/InstantInterval.kt → ...celize/src/main/kotlin/InstantInterval.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.extensions.parcelize.readInstant
import io.islandtime.extensions.parcelize.writeInstant
import io.islandtime.ranges.InstantInterval
import kotlinx.parcelize.Parceler

object InstantIntervalParceler: Parceler<InstantInterval> {
object InstantIntervalParceler : Parceler<InstantInterval> {
override fun create(parcel: Parcel): InstantInterval {
return InstantInterval(parcel.readInstant(), parcel.readInstant())
}
Expand Down
2 changes: 1 addition & 1 deletion ...me/extensions/parcelize/OffsetDateTime.kt → ...rcelize/src/main/kotlin/OffsetDateTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.DateTime
Expand Down
6 changes: 2 additions & 4 deletions ...arcelize/ranges/OffsetDateTimeInterval.kt → ...src/main/kotlin/OffsetDateTimeInterval.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.extensions.parcelize.readOffsetDateTime
import io.islandtime.extensions.parcelize.writeOffsetDateTime
import io.islandtime.ranges.OffsetDateTimeInterval
import kotlinx.parcelize.Parceler

object OffsetDateTimeIntervalParceler: Parceler<OffsetDateTimeInterval> {
object OffsetDateTimeIntervalParceler : Parceler<OffsetDateTimeInterval> {
override fun create(parcel: Parcel): OffsetDateTimeInterval {
return OffsetDateTimeInterval(parcel.readOffsetDateTime(), parcel.readOffsetDateTime())
}
Expand Down
2 changes: 1 addition & 1 deletion ...ndtime/extensions/parcelize/OffsetTime.kt → ...s/parcelize/src/main/kotlin/OffsetTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.OffsetTime
Expand Down
2 changes: 1 addition & 1 deletion ...e/extensions/parcelize/measures/Period.kt → ...sions/parcelize/src/main/kotlin/Period.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize.measures
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.measures.*
Expand Down
2 changes: 1 addition & 1 deletion ...o/islandtime/extensions/parcelize/Time.kt → extensions/parcelize/src/main/kotlin/Time.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.Time
Expand Down
2 changes: 1 addition & 1 deletion ...landtime/extensions/parcelize/TimeZone.kt → ...ons/parcelize/src/main/kotlin/TimeZone.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.TimeZone
Expand Down
2 changes: 1 addition & 1 deletion ...andtime/extensions/parcelize/YearMonth.kt → ...ns/parcelize/src/main/kotlin/YearMonth.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.YearMonth
Expand Down
2 changes: 1 addition & 1 deletion ...ime/extensions/parcelize/ZonedDateTime.kt → ...arcelize/src/main/kotlin/ZonedDateTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package io.islandtime.extensions.parcelize
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.DateTime
Expand Down
6 changes: 2 additions & 4 deletions ...parcelize/ranges/ZonedDateTimeInterval.kt → .../src/main/kotlin/ZonedDateTimeInterval.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package io.islandtime.extensions.parcelize.ranges
package io.islandtime.parcelize

import android.os.Parcel
import io.islandtime.extensions.parcelize.readZonedDateTime
import io.islandtime.extensions.parcelize.writeZonedDateTime
import io.islandtime.ranges.ZonedDateTimeInterval
import kotlinx.parcelize.Parceler

object ZonedDateTimeIntervalParceler: Parceler<ZonedDateTimeInterval> {
object ZonedDateTimeIntervalParceler : Parceler<ZonedDateTimeInterval> {
override fun create(parcel: Parcel): ZonedDateTimeInterval {
return ZonedDateTimeInterval(parcel.readZonedDateTime(), parcel.readZonedDateTime())
}
Expand Down