it-as
/
patbef-Android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Gradle, SDK and Dependencies

This commit is contained in:
Artur Savitskiy 2024-09-17 12:58:57 +02:00
parent 391f452fd4
commit f547a15a6b
12 changed files with 41 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.idea/compiler.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<bytecodeTargetLevel target="11" /> <bytecodeTargetLevel target="17" />
</component> </component>
</project> </project>

4
.idea/gradle.xml
View File

@ -4,15 +4,15 @@
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules"> <option name="modules">
<set> <set>
<option value="$PROJECT_DIR$" /> <option value="$PROJECT_DIR$" />
<option value="$PROJECT_DIR$/app" /> <option value="$PROJECT_DIR$/app" />
</set> </set>
</option> </option>
<option name="resolveExternalAnnotations" value="false" />
</GradleProjectSettings> </GradleProjectSettings>
</option> </option>
</component> </component>

2
.idea/misc.xml
View File

@ -80,7 +80,7 @@
</map> </map>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Android Studio default JDK" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

37
app/build.gradle
View File

@ -1,5 +1,6 @@
plugins { plugins {
id 'com.android.application' id 'com.android.application'
id 'com.google.gms.google-services'
} }
android { android {
@ -7,10 +8,10 @@ android {
defaultConfig { defaultConfig {
applicationId "de.labor_stein.befund" applicationId "de.labor_stein.befund"
minSdk 26 minSdk 31
targetSdk 34 targetSdk 34
versionCode 11 versionCode 13
versionName "1.9" versionName "1.11"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }
@ -28,30 +29,28 @@ android {
buildFeatures { buildFeatures {
viewBinding true viewBinding true
} }
namespace 'de.labor_stein.befund'
} }
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
dependencies { dependencies {
implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.appcompat:appcompat:1.7.0'
implementation 'com.google.android.material:material:1.5.0' implementation 'com.google.android.material:material:1.12.0'
implementation 'androidx.constraintlayout:constraintlayout:2.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
implementation 'androidx.navigation:navigation-fragment:2.4.2' implementation 'androidx.navigation:navigation-fragment:2.8.0'
implementation 'androidx.navigation:navigation-ui:2.4.2' implementation 'androidx.navigation:navigation-ui:2.8.0'
implementation 'com.google.firebase:firebase-messaging:21.1.0' implementation 'com.google.firebase:firebase-messaging:24.0.1'
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
implementation 'androidx.camera:camera-core:1.1.0-alpha03' implementation 'androidx.camera:camera-core:1.5.0-alpha01'
testImplementation 'junit:junit:4.+' testImplementation 'junit:junit:4.13.2'
androidTestImplementation 'androidx.test.ext:junit:1.1.3' androidTestImplementation 'androidx.test.ext:junit:1.2.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
implementation 'org.whispersystems:curve25519-java:0.5.0' implementation 'org.whispersystems:curve25519-java:0.5.0'
implementation 'com.google.code.gson:gson:2.9.0' implementation 'com.google.code.gson:gson:2.10.1'
implementation 'com.google.crypto.tink:tink-android:1.6.1' implementation 'com.google.crypto.tink:tink-android:1.6.1'
implementation 'com.github.bumptech.glide:glide:4.9.0' implementation 'com.github.bumptech.glide:glide:4.9.0'
implementation 'com.github.barteksc:android-pdf-viewer:2.8.2' implementation 'com.github.mhiew:android-pdf-viewer:3.2.0-beta.1'
implementation 'com.journeyapps:zxing-android-embedded:4.3.0' implementation 'com.journeyapps:zxing-android-embedded:4.3.0'
implementation("androidx.biometric:biometric:1.1.0") implementation("androidx.biometric:biometric:1.1.0")
implementation platform('com.google.firebase:firebase-bom:30.2.0') implementation platform('com.google.firebase:firebase-bom:33.3.0')
} }

24
app/google-services.json
View File

@ -1,36 +1,26 @@
{ {
"project_info": { "project_info": {
"project_number": "127283607700", "project_number": "241773196582",
"project_id": "befund-01", "project_id": "befund2go",
"storage_bucket": "befund-01.appspot.com" "storage_bucket": "befund2go.appspot.com"
}, },
"client": [ "client": [
{ {
"client_info": { "client_info": {
"mobilesdk_app_id": "1:127283607700:android:c2f0153fc4c20ef87a5c81", "mobilesdk_app_id": "1:241773196582:android:ee6cecd5b89c5ef536bde7",
"android_client_info": { "android_client_info": {
"package_name": "de.labor_stein.befund" "package_name": "de.labor_stein.befund"
} }
}, },
"oauth_client": [ "oauth_client": [],
{
"client_id": "127283607700-phvfe3dp6d41ej37b2m543ng16as8bki.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [ "api_key": [
{ {
"current_key": "AIzaSyBkmPBIyKCsYilMNH6lxjlgfNPxm3OPyoo" "current_key": "AIzaSyAiFKsbS49ld3gdLWgnB76-bLqBbyapqxw"
} }
], ],
"services": { "services": {
"appinvite_service": { "appinvite_service": {
"other_platform_oauth_client": [ "other_platform_oauth_client": []
{
"client_id": "127283607700-phvfe3dp6d41ej37b2m543ng16as8bki.apps.googleusercontent.com",
"client_type": 3
}
]
} }
} }
} }

BIN
app/release/app-release.aab
View File

Binary file not shown.

3
app/src/main/AndroidManifest.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android">
package="de.labor_stein.befund">
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/> <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

2
app/src/main/java/de/labor_stein/befund/Core/Models/Settings.java
View File

@ -21,7 +21,7 @@ import de.labor_stein.befund.Core.Log;
public class Settings public class Settings
{ {
// Change this variable to enforce Privacy Policy Popup on update to this version // Change this variable to enforce Privacy Policy Popup on update to this version
public static String PrivacyPolicyAcceptedKey = "privacy_policy_accepted_2"; public static String PrivacyPolicyAcceptedKey = "privacy_policy_accepted_3";
public String public_key = null; public String public_key = null;
public String hashed_private_key = null; public String hashed_private_key = null;

4
build.gradle
View File

@ -5,8 +5,8 @@ buildscript {
mavenCentral() mavenCentral()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.1' classpath 'com.android.tools.build:gradle:8.6.0'
classpath 'com.google.gms:google-services:4.3.12' classpath 'com.google.gms:google-services:4.4.2'
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files
} }

3
gradle.properties
View File

@ -17,3 +17,6 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
android.useAndroidX=true android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX # Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true android.enableJetifier=true
android.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Mon Jun 13 09:03:00 CEST 2022 #Tue Sep 17 11:16:04 CEST 2024
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

2
settings.gradle
View File

@ -3,7 +3,7 @@ dependencyResolutionManagement {
repositories { repositories {
google() google()
mavenCentral() mavenCentral()
jcenter() // Warning: this repository is going to shut down soon gradlePluginPortal()
} }
} }
rootProject.name = "Befund" rootProject.name = "Befund"