Skip to content

Commit

Permalink
Merge pull request #83 from algo-1/algo-1/fix-vulnerabilities
Browse files Browse the repository at this point in the history
Algo 1/fix vulnerabilities
  • Loading branch information
algo-1 authored Oct 16, 2024
2 parents bc59f33 + c513d0a commit fd664a3
Show file tree
Hide file tree
Showing 9 changed files with 237 additions and 143 deletions.
6 changes: 6 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2
updates:
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "daily"
3 changes: 2 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apply plugin: 'com.android.application'

def msalVersion = "4.+"
def msalVersion = "5.+"

if (project.hasProperty("distMsalVersion")) {
msalVersion = distMsalVersion
Expand Down Expand Up @@ -86,6 +86,7 @@ android {
setIgnore(true);
}
}
namespace 'com.azuresamples.msalandroidapp'
}

dependencies {
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.azuresamples.msalandroidapp">
xmlns:tools="http://schemas.android.com/tools">

<application
android:allowBackup="true"
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,7 @@ org.gradle.jvmargs=-Xmx1536m
# org.gradle.parallel=true

android.useAndroidX=true
android.enableJetifier=true
android.enableJetifier=true
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false
2 changes: 1 addition & 1 deletion gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ ext {
buildToolsVersion = "28.0.3"

// Plugins
gradleVersion = '7.4.2'
gradleVersion = '8.2.2'
androidMavenGradlePluginVersion = "1.4.1"

// Libraries
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 3 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#Mon Jul 01 08:53:33 PDT 2019
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
Loading

0 comments on commit fd664a3

Please sign in to comment.