diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..490cf9b Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser new file mode 100644 index 0000000..86e5c06 Binary files /dev/null and b/.idea/caches/gradle_models.ser differ diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..cb49e80 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle____local_aars___C__a_gitlab_Noteworthy_Tunerz_myfork_libs_TarsosDSP_Android_2_4_jar_unspecified_jar.xml b/.idea/libraries/Gradle____local_aars___C__a_gitlab_Noteworthy_Tunerz_myfork_libs_TarsosDSP_Android_2_4_jar_unspecified_jar.xml new file mode 100644 index 0000000..28cc8f0 --- /dev/null +++ b/.idea/libraries/Gradle____local_aars___C__a_gitlab_Noteworthy_Tunerz_myfork_libs_TarsosDSP_Android_2_4_jar_unspecified_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..7631aec --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..1d0f2d0 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Noteworthy-Tunerz-myfork.iml b/Noteworthy-Tunerz-myfork.iml new file mode 100644 index 0000000..c7a42c6 --- /dev/null +++ b/Noteworthy-Tunerz-myfork.iml @@ -0,0 +1,119 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index d81b749..d6e7d87 100644 --- a/build.gradle +++ b/build.gradle @@ -15,8 +15,6 @@ buildscript { apply plugin: 'com.android.application' -Properties secureProperties = new Properties() -secureProperties.load(new FileInputStream("secure.properties")) android { compileSdkVersion 28 @@ -56,10 +54,7 @@ android { signingConfigs { release { - storeFile file("../BI_on_googlecode.com/private/my-release-key.keystore") - storePassword secureProperties['key.store.password'] - keyAlias "alias_name" - keyPassword secureProperties['key.alias.password'] + } } diff --git a/build.gradle.bak b/build.gradle.bak new file mode 100644 index 0000000..d81b749 --- /dev/null +++ b/build.gradle.bak @@ -0,0 +1,96 @@ +buildscript { + repositories { + mavenCentral() + google() + maven { + url "https://jitpack.io" + } + jcenter() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.4.2' + } +} + +apply plugin: 'com.android.application' + +Properties secureProperties = new Properties() +secureProperties.load(new FileInputStream("secure.properties")) + +android { + compileSdkVersion 28 + //buildToolsVersion "27.0.1" // With Android plugin 3.0.0+, automatically uses latest now + + defaultConfig { + minSdkVersion 11 + targetSdkVersion 28 + + vectorDrawables.useSupportLibrary = false + + //jackOptions { + // enabled false + //} + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } + + lintOptions { + disable 'MissingTranslation' + } + + signingConfigs { + release { + storeFile file("../BI_on_googlecode.com/private/my-release-key.keystore") + storePassword secureProperties['key.store.password'] + keyAlias "alias_name" + keyPassword secureProperties['key.alias.password'] + } + } + + buildTypes { + release { + signingConfig signingConfigs.release + minifyEnabled true // Only enable on actual release builds + // shrinkResources true // Only enable on actual release builds + //proguardFile 'proguard-rules.pro' + proguardFile 'proguard-no-obfuscation' + } + } +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) +} + +repositories { + mavenCentral() + google() + maven { + url 'https://maven.google.com' + // Alternative URL is 'https://dl.google.com/dl/android/maven2/' + url "https://jitpack.io" + } + jcenter() +} + +gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + //options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + } +} diff --git a/src/com/darshancomputing/tuner/TunerActivity.java b/src/com/darshancomputing/tuner/TunerActivity.java index ee1ab02..b6e0f39 100644 --- a/src/com/darshancomputing/tuner/TunerActivity.java +++ b/src/com/darshancomputing/tuner/TunerActivity.java @@ -58,6 +58,8 @@ import be.tarsos.dsp.pitch.PitchProcessor; import be.tarsos.dsp.pitch.PitchProcessor.PitchEstimationAlgorithm; +/* jim push test */ + public class TunerActivity extends Activity { private SharedPreferences settings; private SharedPreferences sp_store;