diff --git a/.gitignore b/.gitignore index 51ff651c..39d9262b 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,9 @@ captures/ # Intellij *.iml .idea/workspace.xml +.idea/libraries +.idea/encodings.xml +.idea/misc.xml # Keystore files *.jks diff --git a/ultrasonic/src/main/AndroidManifest.xml b/ultrasonic/src/main/AndroidManifest.xml index 05aed646..f4dbf186 100644 --- a/ultrasonic/src/main/AndroidManifest.xml +++ b/ultrasonic/src/main/AndroidManifest.xml @@ -2,16 +2,14 @@ <manifest xmlns:a="http://schemas.android.com/apk/res/android" package="org.moire.ultrasonic" a:installLocation="auto" - a:versionCode="53" - a:versionName="1.5.1"> + a:versionCode="54" + a:versionName="1.5.2"> <uses-permission a:name="android.permission.INTERNET"/> - <uses-permission a:name="android.permission.READ_PHONE_STATE"/> <uses-permission a:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission a:name="android.permission.WAKE_LOCK"/> <uses-permission a:name="android.permission.WRITE_EXTERNAL_STORAGE"/> <uses-permission a:name="android.permission.READ_EXTERNAL_STORAGE"/> - <uses-permission a:name="android.permission.RECORD_AUDIO"/> <uses-permission a:name="android.permission.MODIFY_AUDIO_SETTINGS"/> <uses-permission a:name="android.permission.BLUETOOTH"/> diff --git a/ultrasonic/ultrasonic-ultrasonic.iml b/ultrasonic/ultrasonic-ultrasonic.iml index 04839edb..689394f7 100644 --- a/ultrasonic/ultrasonic-ultrasonic.iml +++ b/ultrasonic/ultrasonic-ultrasonic.iml @@ -66,14 +66,6 @@ <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> - <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" /> @@ -82,6 +74,14 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" /> + <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />