Skip to content

Commit 32c7021

Browse files
SumeraMartinSumeraMartin
authored
Merge pull request #51 from futuredapp/feature/fix-compose-build-and-rename-package
Fix compose build and rename package
2 parents 4bf0302 + 07dfe90 commit 32c7021

17 files changed

Lines changed: 40 additions & 33 deletions

File tree

‎buildSrc/src/main/kotlin/Versions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
object Versions {
22
// gradle
3-
const val gradle = "4.1.0-alpha07"
3+
const val gradle = "4.1.0-alpha09"
44

55
// kotlin
66
const val kotlin = "1.3.72"

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
#Wed May 20 09:02:42 CEST 2020
12
distributionBase=GRADLE_USER_HOME
23
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-2-bin.zip

‎library-compose/build.gradle.kts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,12 @@ android {
4040
composeOptions {
4141
kotlinCompilerExtensionVersion = Versions.jetpackCompose
4242
}
43+
44+
packagingOptions {
45+
val newExcludes = getExcludes()
46+
newExcludes.remove("/META-INF/*.kotlin_module")
47+
excludes = newExcludes
48+
}
4349
}
4450

4551
dependencies {

‎library-compose/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<manifest
2-
package="app.futured.donut.library.compose">
2+
package="app.futured.donut.compose">
33
</manifest>

library-compose/src/main/java/app/futured/donut/library/compose/Donut.kt renamed to library-compose/src/main/java/app/futured/donut/compose/Donut.kt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.futured.donut.library.compose
1+
package app.futured.donut.compose
22

33
import androidx.compose.Composable
44
import androidx.compose.remember
@@ -16,13 +16,13 @@ import androidx.ui.layout.fillMaxSize
1616
import androidx.ui.unit.PxSize
1717
import androidx.ui.unit.center
1818
import androidx.ui.unit.min
19-
import app.futured.donut.library.compose.data.DonutConfig
20-
import app.futured.donut.library.compose.data.DonutModel
21-
import app.futured.donut.library.compose.internal.data.DonutPathData
22-
import app.futured.donut.library.compose.internal.data.DonutPathDataEntry
23-
import app.futured.donut.library.compose.internal.data.DonutProgressValues
24-
import app.futured.donut.library.compose.internal.data.SectionsPathData
25-
import app.futured.donut.library.compose.internal.extensions.animateOrSnapDistinctValues
19+
import app.futured.donut.compose.data.DonutConfig
20+
import app.futured.donut.compose.data.DonutModel
21+
import app.futured.donut.compose.internal.data.DonutPathData
22+
import app.futured.donut.compose.internal.data.DonutPathDataEntry
23+
import app.futured.donut.compose.internal.data.DonutProgressValues
24+
import app.futured.donut.compose.internal.data.SectionsPathData
25+
import app.futured.donut.compose.internal.extensions.animateOrSnapDistinctValues
2626
import kotlin.math.max
2727

2828
/**

library-compose/src/main/java/app/futured/donut/library/compose/data/DonutConfig.kt renamed to library-compose/src/main/java/app/futured/donut/compose/data/DonutConfig.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package app.futured.donut.library.compose.data
1+
package app.futured.donut.compose.data
22

33
import androidx.animation.AnimationBuilder
44
import androidx.animation.TweenBuilder
55
import androidx.compose.Model
66
import androidx.ui.graphics.Color
7-
import app.futured.donut.library.compose.DonutProgress
7+
import app.futured.donut.compose.DonutProgress
88

99
/**
1010
* Configuration class for [DonutProgress]

library-compose/src/main/java/app/futured/donut/library/compose/data/DonutModel.kt renamed to library-compose/src/main/java/app/futured/donut/compose/data/DonutModel.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package app.futured.donut.library.compose.data
1+
package app.futured.donut.compose.data
22

33
import androidx.compose.Model
44
import androidx.ui.graphics.Color
5-
import app.futured.donut.library.compose.DonutProgress
6-
import app.futured.donut.library.compose.internal.extensions.sumByFloat
5+
import app.futured.donut.compose.DonutProgress
6+
import app.futured.donut.compose.internal.extensions.sumByFloat
77

88
/**
99
* Wrapper for all necessary data values used by [DonutProgress] to draw its content.

library-compose/src/main/java/app/futured/donut/library/compose/data/DonutSection.kt renamed to library-compose/src/main/java/app/futured/donut/compose/data/DonutSection.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.futured.donut.library.compose.data
1+
package app.futured.donut.compose.data
22

33
import androidx.compose.Model
44
import androidx.ui.graphics.Color

library-compose/src/main/java/app/futured/donut/library/compose/internal/AnimatedColor.kt renamed to library-compose/src/main/java/app/futured/donut/compose/internal/AnimatedColor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.futured.donut.library.compose.internal
1+
package app.futured.donut.compose.internal
22

33
import androidx.animation.AnimatedValue
44
import androidx.animation.AnimationVector4D

library-compose/src/main/java/app/futured/donut/library/compose/internal/data/DonutPathData.kt renamed to library-compose/src/main/java/app/futured/donut/compose/internal/data/DonutPathData.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.futured.donut.library.compose.internal.data
1+
package app.futured.donut.compose.internal.data
22

33
internal data class DonutPathData(
44
val masterPathData: DonutPathDataEntry,

0 commit comments

Comments
 (0)