Browse Source

Release 3.0.1

Aidan Follestad 5 years ago
parent
commit
50a254ff06

+ 7 - 7
README.md

@@ -29,7 +29,7 @@ core and normal-use functionality.
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:core:3.0.0'
+  implementation 'com.afollestad.material-dialogs:core:3.0.1'
 }
 ```
 
@@ -46,7 +46,7 @@ The `input` module contains extensions to the core module, such as a text input
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:input:3.0.0'
+  implementation 'com.afollestad.material-dialogs:input:3.0.1'
 }
 ```
  
@@ -63,7 +63,7 @@ The `files` module contains extensions to the core module, such as a file and fo
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:files:3.0.0'
+  implementation 'com.afollestad.material-dialogs:files:3.0.1'
 }
 ```
 
@@ -80,7 +80,7 @@ The `color` module contains extensions to the core module, such as a color choos
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:color:3.0.0'
+  implementation 'com.afollestad.material-dialogs:color:3.0.1'
 }
 ```
 
@@ -97,7 +97,7 @@ The `datetime` module contains extensions to make date, time, and date-time pick
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:datetime:3.0.0'
+  implementation 'com.afollestad.material-dialogs:datetime:3.0.1'
 }
 ```
 
@@ -116,7 +116,7 @@ too!
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:bottomsheets:3.0.0'
+  implementation 'com.afollestad.material-dialogs:bottomsheets:3.0.1'
 }
 ```
 
@@ -131,6 +131,6 @@ The `lifecycle` module contains extensions to make dialogs work with AndroidX li
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:lifecycle:3.0.0'
+  implementation 'com.afollestad.material-dialogs:lifecycle:3.0.1'
 }
 ```

+ 3 - 4
RELEASE_NOTES.md

@@ -1,5 +1,4 @@
-3.0.0
+3.0.1
 
-* Kotlin 1.3.40.
-* Added static `DEFAULT_BEHAVIOR` field to `MaterialDialog`, you can override the default behavior for all dialogs.
-* Integrated by new [date-picker](https://github.com/afollestad/date-picker) library to replace the stock date-picker. It will correctly fill the width of dialogs and bottom sheets.
+* Set module names for the Kotlin compiler, so that they don't clash with other third party libs.
+* The module name for the newer date-picker dependency is also being set now, so your app won't have to exclude its module file.

+ 7 - 2
bintrayconfig.gradle

@@ -1,5 +1,8 @@
+// Set default
+ext.modulePackageId = ""
+
 if (!project.rootProject.file('local.properties').exists()) {
-  println "Not applying install.gradle"
+  println "Not applying bintrayconfig.gradle"
   return
 }
 apply plugin: 'com.novoda.bintray-release'
@@ -45,4 +48,6 @@ publish {
   desc = 'A beautiful, fluid, and customizable dialogs API.'
   website = 'https://github.com/afollestad/material-dialogs'
   dryRun = false
-}
+}
+
+ext.modulePackageId = publish.groupId + '.' + publish.artifactId

+ 9 - 0
bottomsheets/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk

+ 9 - 1
color/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk
@@ -24,7 +33,6 @@ android {
   }
 }
 
-
 dependencies {
   implementation 'androidx.recyclerview:recyclerview:' + versions.androidxRecyclerView
   implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin

+ 9 - 0
core/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk

+ 9 - 0
datetime/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk

+ 4 - 4
dependencies.gradle

@@ -3,8 +3,8 @@ ext.versions = [
     minSdk              : 16,
     compileSdk          : 29,
     buildTools          : '29.0.0',
-    publishVersion      : '3.0.0',
-    publishVersionCode  : 255,
+    publishVersion      : '3.0.1',
+    publishVersionCode  : 256,
 
     // Plugins
     gradlePlugin        : '3.4.1',
@@ -24,7 +24,7 @@ ext.versions = [
     coroutines          : '1.2.2',
 
     // afollestad
-    assent              : '2.3.0',
+    assent              : '2.3.1',
     dotsIndicator       : '1.0.0',
-    datePicker          : '0.4.1'
+    datePicker          : '0.4.2'
 ]

+ 1 - 1
documentation/BOTTOMSHEETS.md

@@ -21,7 +21,7 @@ other functionality like showing a grid of items.
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:bottomsheets:3.0.0'
+  implementation 'com.afollestad.material-dialogs:bottomsheets:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/COLOR.md

@@ -16,7 +16,7 @@ The `color` module contains extensions to the core module, such as a color choos
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:color:3.0.0'
+  implementation 'com.afollestad.material-dialogs:color:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/CORE.md

@@ -36,7 +36,7 @@ core and normal-use functionality.
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:core:3.0.0'
+  implementation 'com.afollestad.material-dialogs:core:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/DATETIME.md

@@ -16,7 +16,7 @@ The `datetime` module contains extensions to make date, time, and date-time pick
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:datetime:3.0.0'
+  implementation 'com.afollestad.material-dialogs:datetime:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/FILES.md

@@ -23,7 +23,7 @@ The `files` module contains extensions to the core module, such as a file and fo
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:files:3.0.0'
+  implementation 'com.afollestad.material-dialogs:files:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/INPUT.md

@@ -19,7 +19,7 @@ The `input` module contains extensions to the core module, such as a text input
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:input:3.0.0'
+  implementation 'com.afollestad.material-dialogs:input:3.0.1'
 }
 ```
 

+ 1 - 1
documentation/LIFECYCLE.md

@@ -15,7 +15,7 @@ The `lifecycle` module contains extensions to make dialogs work with AndroidX li
 ```gradle
 dependencies {
   ...
-  implementation 'com.afollestad.material-dialogs:lifecycle:3.0.0'
+  implementation 'com.afollestad.material-dialogs:lifecycle:3.0.1'
 }
 ```
 

+ 9 - 0
files/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk

+ 9 - 0
input/build.gradle

@@ -9,6 +9,15 @@ android {
   compileSdkVersion versions.compileSdk
   buildToolsVersion versions.buildTools
 
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
+    }
+  }
+
   defaultConfig {
     minSdkVersion versions.minSdk
     targetSdkVersion versions.compileSdk

+ 27 - 18
lifecycle/build.gradle

@@ -6,30 +6,39 @@ ext.shard = 'lifecycle'
 apply from: '../bintrayconfig.gradle'
 
 android {
-    compileSdkVersion versions.compileSdk
-    buildToolsVersion versions.buildTools
-
-    defaultConfig {
-        minSdkVersion versions.minSdk
-        targetSdkVersion versions.compileSdk
-        versionCode versions.publishVersionCode
-        versionName versions.publishVersion
-    }
+  compileSdkVersion versions.compileSdk
+  buildToolsVersion versions.buildTools
 
-    sourceSets {
-        main.res.srcDirs = [
-                'src/main/res',
-                'src/main/res-public'
-        ]
+  compileOptions {
+    if (modulePackageId != null && modulePackageId != '') {
+      logger.warn('Package for current module: ' + modulePackageId)
+      kotlinOptions.freeCompilerArgs += ['-module-name', modulePackageId]
+    } else {
+      logger.warn('Skipping setting compiler module name, no package to use.')
     }
+  }
+
+  defaultConfig {
+    minSdkVersion versions.minSdk
+    targetSdkVersion versions.compileSdk
+    versionCode versions.publishVersionCode
+    versionName versions.publishVersion
+  }
+
+  sourceSets {
+    main.res.srcDirs = [
+        'src/main/res',
+        'src/main/res-public'
+    ]
+  }
 }
 
 dependencies {
-    implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin
-    implementation project(':core')
+  implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:' + versions.kotlin
+  implementation project(':core')
 
-    implementation 'androidx.lifecycle:lifecycle-runtime:' + versions.lifecycle
-    annotationProcessor 'androidx.lifecycle:lifecycle-compiler:' + versions.lifecycle
+  implementation 'androidx.lifecycle:lifecycle-runtime:' + versions.lifecycle
+  annotationProcessor 'androidx.lifecycle:lifecycle-compiler:' + versions.lifecycle
 }
 
 apply from: '../spotless.gradle'

+ 0 - 1
sample/build.gradle

@@ -17,7 +17,6 @@ android {
 
   packagingOptions {
     exclude 'META-INF/atomicfu.kotlin_module'
-    exclude 'META-INF/library_release.kotlin_module'
   }
 }