works on android

florent37 · Nov 8, 2018 · 9d1c57b · 9d1c57b
1 parent a46b7a7
commit 9d1c57b
Show file tree

Hide file tree

Showing 30 changed files with 313 additions and 252 deletions.
diff --git a/.idea/.name b/.idea/.name
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
diff --git a/build.gradle b/build.gradle
@@ -54,6 +54,7 @@ allprojects {
     }
 
     apply plugin: 'maven'
+    apply plugin: 'idea'
     apply plugin: 'maven-publish'
     apply plugin: 'com.jfrog.bintray'
 
@@ -148,7 +149,7 @@ configure(allprojects) {
                 version project.version
 
                 if (project.name.endsWith('android')) {
-                    artifact("$buildDir/outputs/aar/multiplatform-log-android-debug.aar")
+                    artifact("$buildDir/outputs/aar/$project.name-debug.aar")
                 }
                 artifact sourceJar
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,13 @@
 group=com.github.florent37
-version=1.0.0
+version=0.0.2
+github_repo="Multiplatform-LiveData"
+github_description="Multiplatform LiveData"
+bintray_repo="maven"
+bintray_name="multiplatform-livedata"
 kotlin_version=1.3.0
 gradle_android_version = 3.2.1
 kotlin_native_version=1.3.0
 bintray_plugin_version=1.8.2-SNAPSHOT
+
+android.useAndroidX=true
+android.enableJetifier=true
diff --git a/gradle/bintray.gradle b/gradle/bintray.gradle
@@ -6,9 +6,11 @@ bintray {
     override = true
 
     pkg {
+        publish = true
+
         userOrg = 'florent37'
         repo = 'maven'
-        name = 'multiplatform-log'
+        name = "multiplatform-livedata"
         licenses = ['Apache-2.0']
         publications = ['mavenProject']
 

diff --git a/gradle/publish.gradle b/gradle/publish.gradle
@@ -1,7 +1,7 @@
 publishing {
     repositories {
         maven {
-            url  = 'https://dl.bintray.com/florent37/maven'
+            url  = "https://dl.bintray.com/florent37/$bintray_repo"
         }
     }
 }
diff --git a/multiplatform-log-android/.gitignore b/multiplatform-log-android/.gitignore
diff --git a/multiplatform-log-android/build.gradle b/multiplatform-log-android/build.gradle
diff --git a/multiplatform-log-android/src/main/AndroidManifest.xml b/multiplatform-log-android/src/main/AndroidManifest.xml
diff --git a/multiplatform-log-android/src/main/java/com.github.florent37/log/Logger.kt b/multiplatform-log-android/src/main/java/com.github.florent37/log/Logger.kt
diff --git a/multiplatform-log-ios/.gitignore b/multiplatform-log-ios/.gitignore
diff --git a/multiplatform-log-ios/build.gradle b/multiplatform-log-ios/build.gradle
diff --git a/multiplatform-log-ios/src/main/kotlin/com/github/florent37/log/Logger.kt b/multiplatform-log-ios/src/main/kotlin/com/github/florent37/log/Logger.kt