Fix StrictMode Maven artifact

androidbroadcast · Mar 9, 2019 · c71f6d2 · c71f6d2
1 parent bfbd4da
commit c71f6d2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 16 deletions.
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ dependencies {
     implementation "com.kirich1409:strict-mode-compat:28.0.0"
 
     // Kotlin Extensions
-    implementation "com.kirich1409:strict-mode-compat-kotlin:28.1.1"
+    implementation "com.kirich1409:strict-mode-compat-kotlin:28.1.2"
 }
 ```
 
@@ -30,14 +30,14 @@ Sample
 ###### build.gradle ######
 ```groovy
 android {
-    defaultConfig {
-        buildConfigField 'boolean', 'DEVELOPER_MODE', 'false'
-    }
-
     buildTypes {
         debug {
             buildConfigField 'boolean', 'DEVELOPER_MODE', 'true'
         }
+        
+        release {
+            buildConfigField 'boolean', 'DEVELOPER_MODE', 'false'
+        }
     }
 }
 ```

diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,10 @@ buildscript {
     }
 }
 
+def getVersionCode(String versionName) {
+    return versionName.split("\\.").collect { String.format("%02d", it.toInteger()) }.join().toInteger()
+}
+
 ext {
     androidXAnnotationsVersion = '1.0.2'
     androidXAppCompatVersion = '1.0.2'
@@ -25,8 +29,9 @@ ext {
     targetSdkVersion = 27
     buildToolsVersion = '28.0.3'
 
-    versionName = '28.1.1'
-    versionCode = versionName.split("\\.").collect { String.format("%02d", it.toInteger()) }.join().toInteger()
+    strictModeCompatVersionName = '28.1.0'
+    versionName = strictModeCompatVersionName
+    strictModeCompatKotlinVersionName = '28.1.2'
 }
 
 group = 'by.kirich1409'

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -9,7 +9,7 @@ android {
         applicationId "com.kirillr.application"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
+        versionCode getVersionCode(rootProject.ext.versionName)
         versionName rootProject.ext.versionName
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"

diff --git a/strict-mode-compat-kotlin/build.gradle b/strict-mode-compat-kotlin/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        versionCode getVersionCode(rootProject.ext.strictModeCompatKotlinVersionName)
+        versionName rootProject.ext.strictModeCompatKotlinVersionName
     }
 }
 

diff --git a/strict-mode-compat-kotlin/publish.gradle b/strict-mode-compat-kotlin/publish.gradle
@@ -1,5 +1,5 @@
 group = 'com.kirich1409'
-version = rootProject.ext.versionName
+version = rootProject.ext.strictModeCompatKotlinVersionName
 
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
@@ -38,7 +38,7 @@ bintray {
         githubReleaseNotesFile = 'README.md' //Optional Github readme file
 
         version {
-            name = rootProject.ext.versionName
+            name = rootProject.ext.strictModeCompatKotlinVersionName
             desc = 'Android StrictMode Compat on Kotlin'
             released = new Date()
         }

diff --git a/strict-mode-compat/build.gradle b/strict-mode-compat/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode rootProject.ext.versionCode
-        versionName rootProject.ext.versionName
+        versionCode getVersionCode(rootProject.ext.strictModeCompatVersionName)
+        versionName rootProject.ext.strictModeCompatVersionName
     }
 
     buildTypes {

diff --git a/strict-mode-compat/publish.gradle b/strict-mode-compat/publish.gradle
@@ -1,5 +1,5 @@
 group = 'com.kirich1409'
-version = rootProject.ext.versionName
+version = rootProject.ext.strictModeCompatVersionName
 
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
@@ -50,7 +50,7 @@ bintray {
         githubReleaseNotesFile = 'README.md' //Optional Github readme file
 
         version {
-            name = rootProject.ext.versionName
+            name = rootProject.ext.strictModeCompatVersionName
             desc = 'Android StrictMode Compat Library'
             released = new Date()
         }