diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml
index 7f68460..e497da9 100644
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -3,6 +3,7 @@
   <component name="RunConfigurationProducerService">
     <option name="ignoredProducers">
       <set>
+        <option value="com.android.tools.idea.compose.preview.runconfiguration.ComposePreviewRunConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
         <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
diff --git a/DeviceIdentifiersWrapper/build.gradle b/DeviceIdentifiersWrapper/build.gradle
index 482fdc3..067fda7 100644
--- a/DeviceIdentifiersWrapper/build.gradle
+++ b/DeviceIdentifiersWrapper/build.gradle
@@ -37,39 +37,8 @@ dependencies {
     compileOnly 'com.symbol:emdk:+'
 }
 
-def jarName = 'deviceidentifierswrapper.jar'
-
-task clearJarRelease(type: Delete) {
-    delete "${project.buildDir}/outputs/jar/release/" + jarName
-}
-
-task clearJarDebug(type: Delete) {
-    delete "${project.buildDir}/outputs/jar/debug/" + jarName
-}
-
-task makeJarRelease(type: Copy) {
-    from("${project.buildDir}/intermediates/intermediate-jars/release/")
-    into("${project.buildDir}/outputs/jar/release")
-    include('classes.jar')
-    rename('classes.jar', jarName)
-}
-
-task makeJarDebug(type: Copy) {
-    from("${project.buildDir}/intermediates/intermediate-jars/debug/")
-    into("${project.buildDir}/outputs/jar/debug")
-    include('classes.jar')
-    rename('classes.jar', jarName)
-}
-
-task makeAllJar(type: Copy) {}
-
-makeJarRelease.dependsOn(clearJarRelease, build)
-makeJarDebug.dependsOn(clearJarDebug, build)
-
-makeAllJar.dependsOn(makeJarDebug,makeJarRelease)
-
 /*
-Publish tasks
+Generate release files for publication and Zip them
 https://medium.com/@daniellevass/how-to-publish-your-android-studio-library-to-jcenter-5384172c4739
 https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle
  */
@@ -77,8 +46,6 @@ https://raw.githubusercontent.com/blundell/release-android-library/master/androi
 // ./gradlew clean build generateRelease
 apply plugin: 'maven'
 
-def groupId = project.PUBLISH_GROUP_ID
-def artifactId = project.PUBLISH_ARTIFACT_ID
 def version = project.PUBLISH_VERSION
 
 def localReleaseDest = "${buildDir}/release/${version}"
@@ -91,29 +58,19 @@ task androidJavadocs(type: Javadoc) {
 }
 
 task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    classifier = 'javadoc'
+    archiveClassifier = 'javadoc'
     from androidJavadocs.destinationDir
 }
 
 task androidSourcesJar(type: Jar) {
-    classifier = 'sources'
+    archiveClassifier = 'sources'
     from android.sourceSets.main.java.srcDirs
 }
 
-uploadArchives {
-    repositories.mavenDeployer {
-        pom.groupId = groupId
-        pom.artifactId = artifactId
-        pom.version = version
-        // Add other pom properties here if you want (developer details / licenses)
-        repository(url: "file://${localReleaseDest}")
-    }
-}
-
 task zipRelease(type: Zip) {
     from localReleaseDest
     destinationDir buildDir
-    archiveName "release-${version}.zip"
+    archiveBaseName =  "release-${version}"
 }
 
 task generateRelease {
@@ -123,7 +80,6 @@ task generateRelease {
     }
 }
 
-generateRelease.dependsOn(uploadArchives)
 generateRelease.dependsOn(zipRelease)