Project dependencies and package name updated

roman_tcaregorodtcev · roman_tcaregorodtcev · commit ac0d716c7144 · 2019-04-19T12:24:32.000+03:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,7 +5,7 @@ apply plugin: 'kotlin-android-extensions'
 android {
     compileSdkVersion 28
     defaultConfig {
-        applicationId "omega_r.com.extensions"
+        applicationId "omega_r.com.extensions.simple"
         minSdkVersion 14
         targetSdkVersion 28
         versionCode 1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="omega_r.com.extensions">
+          package="omega_r.com.extensions.simple">
 
     <application
             android:allowBackup="true"
diff --git a/app/src/main/java/omega_r/com/extensions/simple/MainActivity.kt b/app/src/main/java/omega_r/com/extensions/simple/MainActivity.kt
@@ -1,4 +1,4 @@
-package omega_r.com.extensions
+package omega_r.com.extensions.simple
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
diff --git a/lib/build.gradle b/lib/build.gradle
@@ -22,6 +22,10 @@ android {
         }
     }
 
+    packagingOptions {
+        exclude 'META-INF/lib_release.kotlin_module'
+    }
+
 }
 
 dependencies {
diff --git a/lib/src/androidTest/java/omega_r/com/extensions/ExampleInstrumentedTest.java b/lib/src/androidTest/java/omega_r/com/extensions/ExampleInstrumentedTest.java
diff --git a/lib/src/test/java/omega_r/com/extensions/ExampleUnitTest.java b/lib/src/test/java/omega_r/com/extensions/ExampleUnitTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package omega_r.com.extensions`
	`1`	`+package omega_r.com.extensions.simple`
`2`	`2`
`3`	`3`	`import androidx.appcompat.app.AppCompatActivity`
`4`	`4`	`import android.os.Bundle`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,10 @@ android {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
	`25`	`+ packagingOptions {`
	`26`	`+ exclude 'META-INF/lib_release.kotlin_module'`
	`27`	`+ }`
	`28`	`+`
`25`	`29`	`}`
`26`	`30`
`27`	`31`	`dependencies {`