Merge pull request #51 from futuredapp/feature/fix-compose-build-and-…

…rename-package Fix compose build and rename package
futuredapp · May 20, 2020 · 32c7021 · 32c7021
2 parents 4bf0302 + 07dfe90
commit 32c7021
Show file tree

Hide file tree

Showing 17 changed files with 40 additions and 33 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -1,6 +1,6 @@
 object Versions {
     // gradle
-    const val gradle = "4.1.0-alpha07"
+    const val gradle = "4.1.0-alpha09"
 
     // kotlin
     const val kotlin = "1.3.72"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Wed May 20 09:02:42 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-rc-2-bin.zip
diff --git a/library-compose/build.gradle.kts b/library-compose/build.gradle.kts
@@ -40,6 +40,12 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = Versions.jetpackCompose
     }
+
+    packagingOptions {
+        val newExcludes = getExcludes()
+        newExcludes.remove("/META-INF/*.kotlin_module")
+        excludes = newExcludes
+    }
 }
 
 dependencies {

diff --git a/library-compose/src/main/AndroidManifest.xml b/library-compose/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <manifest
-    package="app.futured.donut.library.compose">
+    package="app.futured.donut.compose">
 </manifest>
diff --git a/...pp/futured/donut/library/compose/Donut.kt → ...n/java/app/futured/donut/compose/Donut.kt b/...pp/futured/donut/library/compose/Donut.kt → ...n/java/app/futured/donut/compose/Donut.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose
+package app.futured.donut.compose
 
 import androidx.compose.Composable
 import androidx.compose.remember
@@ -16,13 +16,13 @@ import androidx.ui.layout.fillMaxSize
 import androidx.ui.unit.PxSize
 import androidx.ui.unit.center
 import androidx.ui.unit.min
-import app.futured.donut.library.compose.data.DonutConfig
-import app.futured.donut.library.compose.data.DonutModel
-import app.futured.donut.library.compose.internal.data.DonutPathData
-import app.futured.donut.library.compose.internal.data.DonutPathDataEntry
-import app.futured.donut.library.compose.internal.data.DonutProgressValues
-import app.futured.donut.library.compose.internal.data.SectionsPathData
-import app.futured.donut.library.compose.internal.extensions.animateOrSnapDistinctValues
+import app.futured.donut.compose.data.DonutConfig
+import app.futured.donut.compose.data.DonutModel
+import app.futured.donut.compose.internal.data.DonutPathData
+import app.futured.donut.compose.internal.data.DonutPathDataEntry
+import app.futured.donut.compose.internal.data.DonutProgressValues
+import app.futured.donut.compose.internal.data.SectionsPathData
+import app.futured.donut.compose.internal.extensions.animateOrSnapDistinctValues
 import kotlin.math.max
 
 /**

diff --git a/...donut/library/compose/data/DonutConfig.kt → ...futured/donut/compose/data/DonutConfig.kt b/...donut/library/compose/data/DonutConfig.kt → ...futured/donut/compose/data/DonutConfig.kt
@@ -1,10 +1,10 @@
-package app.futured.donut.library.compose.data
+package app.futured.donut.compose.data
 
 import androidx.animation.AnimationBuilder
 import androidx.animation.TweenBuilder
 import androidx.compose.Model
 import androidx.ui.graphics.Color
-import app.futured.donut.library.compose.DonutProgress
+import app.futured.donut.compose.DonutProgress
 
 /**
  * Configuration class for [DonutProgress]

diff --git a/.../donut/library/compose/data/DonutModel.kt → .../futured/donut/compose/data/DonutModel.kt b/.../donut/library/compose/data/DonutModel.kt → .../futured/donut/compose/data/DonutModel.kt
@@ -1,9 +1,9 @@
-package app.futured.donut.library.compose.data
+package app.futured.donut.compose.data
 
 import androidx.compose.Model
 import androidx.ui.graphics.Color
-import app.futured.donut.library.compose.DonutProgress
-import app.futured.donut.library.compose.internal.extensions.sumByFloat
+import app.futured.donut.compose.DonutProgress
+import app.futured.donut.compose.internal.extensions.sumByFloat
 
 /**
  * Wrapper for all necessary data values used by [DonutProgress] to draw its content.

diff --git a/...onut/library/compose/data/DonutSection.kt → ...utured/donut/compose/data/DonutSection.kt b/...onut/library/compose/data/DonutSection.kt → ...utured/donut/compose/data/DonutSection.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.data
+package app.futured.donut.compose.data
 
 import androidx.compose.Model
 import androidx.ui.graphics.Color

diff --git a/...library/compose/internal/AnimatedColor.kt → ...d/donut/compose/internal/AnimatedColor.kt b/...library/compose/internal/AnimatedColor.kt → ...d/donut/compose/internal/AnimatedColor.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.internal
+package app.futured.donut.compose.internal
 
 import androidx.animation.AnimatedValue
 import androidx.animation.AnimationVector4D

diff --git a/...ry/compose/internal/data/DonutPathData.kt → ...ut/compose/internal/data/DonutPathData.kt b/...ry/compose/internal/data/DonutPathData.kt → ...ut/compose/internal/data/DonutPathData.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.internal.data
+package app.futured.donut.compose.internal.data
 
 internal data class DonutPathData(
     val masterPathData: DonutPathDataEntry,

diff --git a/...mpose/internal/data/DonutPathDataEntry.kt → ...mpose/internal/data/DonutPathDataEntry.kt b/...mpose/internal/data/DonutPathDataEntry.kt → ...mpose/internal/data/DonutPathDataEntry.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.internal.data
+package app.futured.donut.compose.internal.data
 
 import androidx.ui.graphics.Color
 

diff --git a/...pose/internal/data/DonutProgressValues.kt → ...pose/internal/data/DonutProgressValues.kt b/...pose/internal/data/DonutProgressValues.kt → ...pose/internal/data/DonutProgressValues.kt
@@ -1,7 +1,7 @@
-package app.futured.donut.library.compose.internal.data
+package app.futured.donut.compose.internal.data
 
 import androidx.animation.AnimatedFloat
-import app.futured.donut.library.compose.internal.AnimatedColor
+import app.futured.donut.compose.internal.AnimatedColor
 
 internal data class DonutProgressValues(
     var animatedGapAngle: AnimatedFloat,

diff --git a/...compose/internal/data/SectionsPathData.kt → ...compose/internal/data/SectionsPathData.kt b/...compose/internal/data/SectionsPathData.kt → ...compose/internal/data/SectionsPathData.kt
@@ -1,6 +1,6 @@
-package app.futured.donut.library.compose.internal.data
+package app.futured.donut.compose.internal.data
 
-import app.futured.donut.library.compose.data.DonutSection
+import app.futured.donut.compose.data.DonutSection
 
 internal data class SectionsPathData(
     val startAngle: Float,

diff --git a/...extensions/BaseAnimatedValueExtensions.kt → ...extensions/BaseAnimatedValueExtensions.kt b/...extensions/BaseAnimatedValueExtensions.kt → ...extensions/BaseAnimatedValueExtensions.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.internal.extensions
+package app.futured.donut.compose.internal.extensions
 
 import androidx.animation.AnimationBuilder
 import androidx.animation.BaseAnimatedValue

diff --git a/...internal/extensions/IterableExtensions.kt → ...internal/extensions/IterableExtensions.kt b/...internal/extensions/IterableExtensions.kt → ...internal/extensions/IterableExtensions.kt
@@ -1,4 +1,4 @@
-package app.futured.donut.library.compose.internal.extensions
+package app.futured.donut.compose.internal.extensions
 
 internal inline fun <T> Iterable<T>.sumByFloat(selector: (T) -> Float): Float {
     var sum = 0f

diff --git a/...le/src/main/kotlin/app/futured/donutsample/ui/playground/compose/PlaygroundComposables.kt b/...le/src/main/kotlin/app/futured/donutsample/ui/playground/compose/PlaygroundComposables.kt
@@ -17,10 +17,10 @@ import androidx.ui.layout.height
 import androidx.ui.layout.size
 import androidx.ui.tooling.preview.Preview
 import androidx.ui.unit.dp
-import app.futured.donut.library.compose.DonutProgress
-import app.futured.donut.library.compose.data.DonutConfig
-import app.futured.donut.library.compose.data.DonutModel
-import app.futured.donut.library.compose.data.DonutSection
+import app.futured.donut.compose.DonutProgress
+import app.futured.donut.compose.data.DonutConfig
+import app.futured.donut.compose.data.DonutModel
+import app.futured.donut.compose.data.DonutSection
 import app.futured.donutsample.ui.playground.common.compose.Circle
 
 @Composable

diff --git a/...rc/main/kotlin/app/futured/donutsample/ui/playground/compose/PlaygroundComposeActivity.kt b/...rc/main/kotlin/app/futured/donutsample/ui/playground/compose/PlaygroundComposeActivity.kt
@@ -18,9 +18,9 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SwitchCompat
 import androidx.ui.core.setContent
 import androidx.ui.graphics.Color
-import app.futured.donut.library.compose.data.DonutConfig
-import app.futured.donut.library.compose.data.DonutModel
-import app.futured.donut.library.compose.data.DonutSection
+import app.futured.donut.compose.data.DonutConfig
+import app.futured.donut.compose.data.DonutModel
+import app.futured.donut.compose.data.DonutSection
 import app.futured.donutsample.R
 import app.futured.donutsample.tools.view.setupSeekbar
 import kotlin.math.max