diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 60f116c0..7958e8bd 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @auth0/dx-sdks-engineer +* @auth0/project-dx-sdks-engineer-codeowner diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 98e09c7c..443b57d1 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -5,30 +5,22 @@ inputs: java: description: The Java version to use required: false - default: 8.0.382-tem - gradle: - description: The Gradle version to use - required: false - default: 6.7.1 - kotlin: - description: The Kotlin version to use - required: false - default: 1.6.21 + default: '11' runs: using: composite steps: - - run: | - curl -s "https://get.sdkman.io" | bash - source "/home/runner/.sdkman/bin/sdkman-init.sh" - sdk list java - sdk install java ${{ inputs.java }} && sdk default java ${{ inputs.java }} - sdk install gradle ${{ inputs.gradle }} && sdk default gradle ${{ inputs.gradle }} - sdk install kotlin ${{ inputs.kotlin }} && sdk default kotlin ${{ inputs.kotlin }} - shell: bash + - name: Set up JDK + uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # pin@4.8.0 + with: + java-version: ${{ inputs.java }} + distribution: 'temurin' + + - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 + + - name: Setup Gradle + uses: gradle/actions/setup-gradle@748248ddd2a24f49513d8f472f81c3a07d4d50e1 # pin@4.4.4 - run: ./gradlew androidDependencies shell: bash - - - uses: gradle/wrapper-validation-action@56b90f209b02bf6d1deae490e9ef18b21a389cd4 # pin@1.1.0 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6778b049..b18fd293 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -3,4 +3,4 @@ updates: - package-ecosystem: 'github-actions' directory: '/' schedule: - interval: 'daily' + interval: 'weekly' diff --git a/.github/workflows/sca_scan.yml b/.github/workflows/sca_scan.yml new file mode 100644 index 00000000..f099855b --- /dev/null +++ b/.github/workflows/sca_scan.yml @@ -0,0 +1,10 @@ +name: SCA + +on: + push: + branches: ["master", "main"] + +jobs: + snyk-cli: + uses: auth0/devsecops-tooling/.github/workflows/sca-scan.yml@main + secrets: inherit \ No newline at end of file diff --git a/.github/workflows/snyk.yml b/.github/workflows/snyk.yml deleted file mode 100644 index 33831618..00000000 --- a/.github/workflows/snyk.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: Snyk - -on: - merge_group: - workflow_dispatch: - pull_request: - types: - - opened - - synchronize - push: - branches: - - main - schedule: - - cron: "30 0 1,15 * *" - -permissions: - contents: read - -concurrency: - group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} - cancel-in-progress: ${{ github.ref != 'refs/heads/main' }} - -jobs: - check: - name: Check for Vulnerabilities - runs-on: ubuntu-latest - - steps: - - if: github.actor == 'dependabot[bot]' || github.event_name == 'merge_group' - run: exit 0 # Skip unnecessary test runs for dependabot and merge queues. Artifically flag as successful, as this is a required check for branch protection. - - - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha || github.ref }} - - - run: npm install snyk -g - - - run: snyk test - env: - SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }} diff --git a/lib/src/main/java/com/auth0/android/lock/views/LogInFormView.java b/lib/src/main/java/com/auth0/android/lock/views/LogInFormView.java index 14605d12..c0f3a79d 100644 --- a/lib/src/main/java/com/auth0/android/lock/views/LogInFormView.java +++ b/lib/src/main/java/com/auth0/android/lock/views/LogInFormView.java @@ -211,7 +211,7 @@ public Object submitForm() { corporateSSO = true; usernameInput.clearFocus(); InputMethodManager imm = (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(getWindowToken(), InputMethodManager.RESULT_UNCHANGED_SHOWN); + imm.hideSoftInputFromWindow(getWindowToken(), 0); return null; }