diff --git a/app/build.gradle b/app/build.gradle index 3cb8ae0..8e23399 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,6 +7,7 @@ plugins { } android { + namespace 'com.cyb3rko.techniklogger' signingConfigs { signingconf { Properties properties = new Properties() @@ -18,12 +19,12 @@ android { keyPassword properties.getProperty("signing.key.password") } } - compileSdk 33 + compileSdk 34 defaultConfig { applicationId "com.cyb3rko.techniklogger" minSdk 19 - targetSdk 33 + targetSdk 34 versionCode 17 versionName "2.2.3" } @@ -43,11 +44,11 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } kotlinOptions { - jvmTarget = '11' + jvmTarget = '17' } buildFeatures { viewBinding true @@ -58,17 +59,17 @@ dependencies { implementation platform('com.google.firebase:firebase-bom:31.4.0') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.cardview:cardview:1.0.0' - implementation 'androidx.core:core-ktx:1.9.0' - implementation 'androidx.navigation:navigation-fragment-ktx:2.5.3' - implementation 'androidx.navigation:navigation-ui-ktx:2.5.3' - implementation 'androidx.recyclerview:recyclerview:1.3.0' + implementation 'androidx.core:core-ktx:1.12.0' + implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version" + implementation "androidx.navigation:navigation-ui-ktx:$navigation_version" + implementation 'androidx.recyclerview:recyclerview:1.3.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'com.afollestad.material-dialogs:bottomsheets:3.3.0' implementation 'com.airbnb.android:lottie:5.2.0' implementation 'com.amitshekhar.android:android-networking:1.0.2' implementation 'com.github.GrenderG:Toasty:1.5.2' implementation 'com.github.parse-community.Parse-SDK-Android:parse:1.26.0' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.10.0' implementation 'com.google.firebase:firebase-analytics-ktx' // BOM versioning implementation 'com.google.firebase:firebase-crashlytics-ktx' // BOM versioning implementation 'com.itextpdf:itextpdf:5.5.13.3' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 5363c1d..06d0bff 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,5 +20,5 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile --keep class com.cyb3rko.techniklogger.* { *; } --keep class com.cyb3rko.techniklogger.** { *; } \ No newline at end of file +-keep class com.cyb3rko.techniklogger.** { *; } +-keep class com.parse.** { (...); } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7baae2c..dc2725e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -133,10 +131,13 @@ location of your Java installation." fi else JAVACMD=java - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. @@ -144,7 +145,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac @@ -152,7 +153,7 @@ if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then '' | soft) :;; #( *) # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 + # shellcheck disable=SC2039,SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,11 +198,15 @@ if "$cygwin" || "$msys" ; then done fi -# Collect all arguments for the java command; -# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of -# shell script including quotes and variable substitutions, so put them in -# double quotes to make sure that they get re-expanded; and -# * put everything else in single quotes, so that it's not re-expanded. + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. set -- \ "-Dorg.gradle.appname=$APP_BASE_NAME" \