From 00979c66a2d4298950e3a31c269353620e3a759f Mon Sep 17 00:00:00 2001 From: Randy Marsh <190734876+tegridyfarmer@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:22:51 +0100 Subject: [PATCH 1/5] Target Android 15 instead of Android 14 This should target Android 15 instead of Android 14 by changing the targetsdk from 34 to 35. --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 00747fd..9004e5f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' android { - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "foss.cnugteren.nlweer" minSdkVersion 21 - targetSdkVersion 34 + targetSdkVersion 35 versionCode 15 versionName "1.10.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" From c128d1a3cb366d5d464d3a7a15cac0dbe2b71205 Mon Sep 17 00:00:00 2001 From: Randy Marsh <190734876+tegridyfarmer@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:29:36 +0100 Subject: [PATCH 2/5] Add Create codeql.yml --- .github/workflows/codeql.yml | 94 ++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 0000000..22573f3 --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,94 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '32 11 * * 6' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: java-kotlin + build-mode: autobuild + - language: python + build-mode: none + # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" From c9e4732694a86d8fe4c5c4f2575e1e718495bbd3 Mon Sep 17 00:00:00 2001 From: Randy Marsh <190734876+tegridyfarmer@users.noreply.github.com> Date: Fri, 17 Jan 2025 12:44:45 +0100 Subject: [PATCH 3/5] Delete .github directory --- .github/FUNDING.yml | 2 - .github/workflows/build_and_test.yml | 26 -------- .github/workflows/codeql.yml | 94 ---------------------------- 3 files changed, 122 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/workflows/build_and_test.yml delete mode 100644 .github/workflows/codeql.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 2cf2390..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,2 +0,0 @@ -github: CNugteren - diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml deleted file mode 100644 index 54e82de..0000000 --- a/.github/workflows/build_and_test.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Android build and test - -on: [push] - -jobs: - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: set up JDK 17 - uses: actions/setup-java@v1 - with: - java-version: 17 - - name: Set-up a temporary keystore for signing - run: | - echo y | keytool -genkeypair -dname "cn=GitHub CI, ou=JavaSoft, o=Sun, c=US" -alias alias -keypass android -keystore ci.keystore -storepass android -keyalg RSA -keysize 2048 -validity 2 - mkdir -p ~/.gradle - echo RELEASE_STORE_FILE=`pwd`/ci.keystore > ~/.gradle/gradle.properties - echo RELEASE_STORE_PASSWORD=android >> ~/.gradle/gradle.properties - echo RELEASE_KEY_ALIAS=alias >> ~/.gradle/gradle.properties - echo RELEASE_KEY_PASSWORD=android >> ~/.gradle/gradle.properties - - name: Build with Gradle - run: ./gradlew build - diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml deleted file mode 100644 index 22573f3..0000000 --- a/.github/workflows/codeql.yml +++ /dev/null @@ -1,94 +0,0 @@ -# For most projects, this workflow file will not need changing; you simply need -# to commit it to your repository. -# -# You may wish to alter this file to override the set of languages analyzed, -# or to provide custom queries or build logic. -# -# ******** NOTE ******** -# We have attempted to detect the languages in your repository. Please check -# the `language` matrix defined below to confirm you have the correct set of -# supported CodeQL languages. -# -name: "CodeQL Advanced" - -on: - push: - branches: [ "master" ] - pull_request: - branches: [ "master" ] - schedule: - - cron: '32 11 * * 6' - -jobs: - analyze: - name: Analyze (${{ matrix.language }}) - # Runner size impacts CodeQL analysis time. To learn more, please see: - # - https://gh.io/recommended-hardware-resources-for-running-codeql - # - https://gh.io/supported-runners-and-hardware-resources - # - https://gh.io/using-larger-runners (GitHub.com only) - # Consider using larger runners or machines with greater resources for possible analysis time improvements. - runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} - permissions: - # required for all workflows - security-events: write - - # required to fetch internal or private CodeQL packs - packages: read - - # only required for workflows in private repositories - actions: read - contents: read - - strategy: - fail-fast: false - matrix: - include: - - language: java-kotlin - build-mode: autobuild - - language: python - build-mode: none - # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' - # Use `c-cpp` to analyze code written in C, C++ or both - # Use 'java-kotlin' to analyze code written in Java, Kotlin or both - # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both - # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, - # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. - # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how - # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages - steps: - - name: Checkout repository - uses: actions/checkout@v4 - - # Initializes the CodeQL tools for scanning. - - name: Initialize CodeQL - uses: github/codeql-action/init@v3 - with: - languages: ${{ matrix.language }} - build-mode: ${{ matrix.build-mode }} - # If you wish to specify custom queries, you can do so here or in a config file. - # By default, queries listed here will override any specified in a config file. - # Prefix the list here with "+" to use these queries and those in the config file. - - # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs - # queries: security-extended,security-and-quality - - # If the analyze step fails for one of the languages you are analyzing with - # "We were unable to automatically build your code", modify the matrix above - # to set the build mode to "manual" for that language. Then modify this step - # to build your code. - # ℹī¸ Command-line programs to run using the OS shell. - # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun - - if: matrix.build-mode == 'manual' - shell: bash - run: | - echo 'If you are using a "manual" build mode for one or more of the' \ - 'languages you are analyzing, replace this with the commands to build' \ - 'your code, for example:' - echo ' make bootstrap' - echo ' make release' - exit 1 - - - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 - with: - category: "/language:${{matrix.language}}" From 77ded7cf696b71d2821f21ec782440d14f70c6bd Mon Sep 17 00:00:00 2001 From: Randy Marsh <190734876+tegridyfarmer@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:53:05 +0100 Subject: [PATCH 4/5] Create FUNDING.yml and .github directory --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..be34db5 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +github: CNugteren From 9defa98c77593819f3bd14cba04b5d4abea79ff2 Mon Sep 17 00:00:00 2001 From: Randy Marsh <190734876+tegridyfarmer@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:54:13 +0100 Subject: [PATCH 5/5] Create build_and_test.yml --- .github/workflows/build_and_test.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/build_and_test.yml diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml new file mode 100644 index 0000000..54e82de --- /dev/null +++ b/.github/workflows/build_and_test.yml @@ -0,0 +1,26 @@ +name: Android build and test + +on: [push] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 + - name: Set-up a temporary keystore for signing + run: | + echo y | keytool -genkeypair -dname "cn=GitHub CI, ou=JavaSoft, o=Sun, c=US" -alias alias -keypass android -keystore ci.keystore -storepass android -keyalg RSA -keysize 2048 -validity 2 + mkdir -p ~/.gradle + echo RELEASE_STORE_FILE=`pwd`/ci.keystore > ~/.gradle/gradle.properties + echo RELEASE_STORE_PASSWORD=android >> ~/.gradle/gradle.properties + echo RELEASE_KEY_ALIAS=alias >> ~/.gradle/gradle.properties + echo RELEASE_KEY_PASSWORD=android >> ~/.gradle/gradle.properties + - name: Build with Gradle + run: ./gradlew build +