diff --git a/android/app/build.gradle b/android/app/build.gradle index 369ca33..0398cc8 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,11 +1,9 @@ apply plugin: 'com.android.application' android { - lintOptions { - abortOnError false - } + namespace 'info.varden.hauk' + compileSdkVersion 33 - buildToolsVersion "29.0.2" defaultConfig { applicationId "info.varden.hauk" minSdkVersion 23 @@ -13,6 +11,7 @@ android { versionCode 13 versionName "1.6.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -24,10 +23,11 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.preference:preference:1.1.1' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test:runner:1.2.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + implementation 'androidx.appcompat:appcompat:1.5.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1' + implementation 'androidx.preference:preference:1.2.0' + testImplementation 'junit:junit:4.13.2' + androidTestImplementation 'androidx.test:runner:1.4.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index b42607e..662c30b 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ + xmlns:tools="http://schemas.android.com/tools"> + @@ -34,7 +34,8 @@ android:launchMode="singleTop" android:screenOrientation="portrait" android:windowSoftInputMode="stateHidden" - android:theme="@style/HomeTheme"> + android:theme="@style/HomeTheme" + android:exported="true"> diff --git a/android/build.gradle b/android/build.gradle index 95a3996..f817a65 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:4.0.1' + classpath 'com.android.tools.build:gradle:7.2.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index fff0b73..c790517 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip diff --git a/android/gradlew b/android/gradlew old mode 100755 new mode 100644 diff --git a/hooks/build b/hooks/build old mode 100755 new mode 100644 diff --git a/hooks/post_push b/hooks/post_push old mode 100755 new mode 100644 diff --git a/hooks/pre_build b/hooks/pre_build old mode 100755 new mode 100644 diff --git a/hooks/pre_push b/hooks/pre_push old mode 100755 new mode 100644 diff --git a/install.sh b/install.sh old mode 100755 new mode 100644