Merge pull request #4 from Omega-R/develop

anton-knyazev · web-flow · commit ac4d5d063c51 · 2019-04-24T14:15:05.000+03:00
Fix build
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,7 +25,7 @@ dependencies {
     implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation "androidx.appcompat:appcompat:$appcompat"
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation project(":lib")
+    implementation project(':extensionslib')
 
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.2.0-alpha03'
diff --git a/extensionslib/.gitignore b/extensionslib/.gitignore
diff --git a/extensionslib/build.gradle b/extensionslib/build.gradle
@@ -22,10 +22,6 @@ android {
         }
     }
 
-    packagingOptions {
-        exclude 'META-INF/lib_release.kotlin_module'
-    }
-
 }
 
 dependencies {
diff --git a/extensionslib/proguard-rules.pro b/extensionslib/proguard-rules.pro
diff --git a/extensionslib/src/main/AndroidManifest.xml b/extensionslib/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="omega_r.com.extensions"/>
+          package="com.omega_r.libs.extensions"/>
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/bitmap/BitmapExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/bitmap/BitmapExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.bitmap
+package com.omega_r.libs.extensions.bitmap
 
 import android.graphics.Bitmap
 import java.io.ByteArrayInputStream
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/canvas/CanvasExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/canvas/CanvasExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.canvas
+package com.omega_r.libs.extensions.canvas
 
 import android.graphics.Canvas
 import android.graphics.Paint
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/canvas/PathExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/canvas/PathExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.canvas
+package com.omega_r.libs.extensions.canvas
 
 import android.graphics.Path
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/common/CommonExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/common/CommonExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.common
+package com.omega_r.libs.extensions.common
 
 fun Any?.ifNull(block: () -> Unit) {
     if (this == null) block()
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/context/PermissionExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/context/PermissionExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.context
+package com.omega_r.libs.extensions.context
 
 import android.content.Context
 import android.content.pm.PackageManager
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/context/ResourceExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/context/ResourceExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.context
+package com.omega_r.libs.extensions.context
 
 import android.content.Context
 import android.graphics.drawable.AnimatedVectorDrawable
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/context/UriExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/context/UriExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.context
+package com.omega_r.libs.extensions.context
 
 import android.content.Context
 import android.net.Uri
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/date/AgeExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/date/AgeExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.date
+package com.omega_r.libs.extensions.date
 
 import java.util.*
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/date/DateExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/date/DateExtensions.kt
@@ -1,8 +1,8 @@
-package omega_r.com.extensions.date
+package com.omega_r.libs.extensions.date
 
 import android.annotation.SuppressLint
 import android.text.format.DateUtils
-import omega_r.com.extensions.date.DateExtensions.Companion.DEFAULT_FORMAT
+import com.omega_r.libs.extensions.date.DateExtensions.Companion.DEFAULT_FORMAT
 import java.text.DateFormat
 import java.text.SimpleDateFormat
 import java.util.*
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/date/DifferenceExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/date/DifferenceExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.date
+package com.omega_r.libs.extensions.date
 
 import java.util.*
 import java.util.concurrent.TimeUnit
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/fragment/FragmentManagerExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/fragment/FragmentManagerExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.fragment
+package com.omega_r.libs.extensions.fragment
 
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.FragmentTransaction
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/list/ComparatorExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/list/ComparatorExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.list
+package com.omega_r.libs.extensions.list
 
 fun <T> Comparator<T>.sort(list: MutableList<T>) {
     list.sortWith(this)
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/list/ListExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/list/ListExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.list
+package com.omega_r.libs.extensions.list
 
 fun <T> List<T>.contains(vararg values: T): Boolean {
     if (isEmpty()) return false
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/log/LogExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/log/LogExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.log
+package com.omega_r.libs.extensions.log
 
 import android.util.Log
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/metrics/DensityExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/metrics/DensityExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.metrics
+package com.omega_r.libs.extensions.metrics
 
 import android.content.res.Resources
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/string/DigitExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/string/DigitExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.string
+package com.omega_r.libs.extensions.string
 
 private val NON_DIGIT_REGEX = Regex("[^A-Za-z0-9]")
 private val DIGIT_REGEX = Regex("[^0-9]")
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/string/EmailExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/string/EmailExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.string
+package com.omega_r.libs.extensions.string
 
 import android.util.Patterns
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/string/StringExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/string/StringExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.string
+package com.omega_r.libs.extensions.string
 
 import android.os.Build
 import android.text.Html
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/BindExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/BindExtensions.kt
@@ -1,10 +1,10 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.graphics.drawable.Drawable
 import android.view.View
 import androidx.annotation.*
-import omega_r.com.extensions.context.getCompatColor
-import omega_r.com.extensions.context.getCompatDrawable
+import com.omega_r.libs.extensions.context.getCompatColor
+import com.omega_r.libs.extensions.context.getCompatDrawable
 
 fun <T : View> View.bind(@IdRes res: Int): Lazy<T> {
     @Suppress("UNCHECKED_CAST")
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/MenuExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/MenuExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.view.Menu
 import android.view.MenuItem
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/RecyclerViewExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/RecyclerViewExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.recyclerview.widget.LinearLayoutManager
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ScaleExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ScaleExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.view.View
 
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/TextViewExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/TextViewExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.graphics.drawable.Drawable
 import android.os.Build.*
@@ -10,7 +10,7 @@ import android.text.style.UnderlineSpan
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.ColorRes
-import omega_r.com.extensions.context.getCompatColor
+import com.omega_r.libs.extensions.context.getCompatColor
 
 fun TextView.addTextListener(
     beforeChanged: ((s: CharSequence) -> Unit)? = null,
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.view.View
 import android.view.ViewGroup
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewGroupExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewGroupExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import android.view.View
 import android.view.ViewGroup
diff --git a/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewPagerExtensions.kt b/extensionslib/src/main/java/com/omega_r/libs/extensions/view/ViewPagerExtensions.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions.view
+package com.omega_r.libs.extensions.view
 
 import androidx.viewpager.widget.ViewPager
 
diff --git a/extensionslib/src/main/res/values/strings.xml b/extensionslib/src/main/res/values/strings.xml
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':lib'
+include ':app', ':extensionslib'

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ android {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`- packagingOptions {`
`26`		`- exclude 'META-INF/lib_release.kotlin_module'`
`27`		`- }`
`28`		`-`
`29`	`25`	`}`
`30`	`26`
`31`	`27`	`dependencies {`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<manifest xmlns:android="http://schemas.android.com/apk/res/android"`
`2`		`- package="omega_r.com.extensions"/>`
	`2`	`+ package="com.omega_r.libs.extensions"/>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package omega_r.com.extensions.bitmap`
	`1`	`+package com.omega_r.libs.extensions.bitmap`
`2`	`2`
`3`	`3`	`import android.graphics.Bitmap`
`4`	`4`	`import java.io.ByteArrayInputStream`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package omega_r.com.extensions.canvas`
	`1`	`+package com.omega_r.libs.extensions.canvas`
`2`	`2`
`3`	`3`	`import android.graphics.Canvas`
`4`	`4`	`import android.graphics.Paint`