Create codeql-analysis.yml

In gradle you can do this to make it easier to switch to a beta version for example

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,74 @@
+# 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"
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ "master" ]
+  schedule:
+    - cron: '42 23 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'java', 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v2
+      with:
+        languages: ${{ matrix.language }}
+        # 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.
+        
+        # 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
+
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v2
+
+    # ℹ️ 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 the Autobuild fails above, remove it and uncomment the following three lines. 
+    #   modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
+
+    # - run: |
+    #   echo "Run, Build Application using script"
+    #   ./location_of_script_within_repo/buildscript.sh
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v2
+      with:
+        category: "/language:${{matrix.language}}"

.github/workflows/gradle2.yml

@@ -1,34 +0,0 @@
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
-
-name: Build Gradle
-
-on: workflow_dispatch
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up JDK 11
-      uses: actions/setup-java@v3
-      with:
-        java-version: '11'
-        distribution: 'temurin'
-    - name: Validate Gradle wrapper
-      uses: gradle/wrapper-validation-action@v1.0.4
-    - name: Make gradle wrapper executable
-      run: chmod +x ./AndorsTrail/gradlew
-    - name: Build with Gradle
-      uses: gradle/gradle-build-action@v2.3.2
-      with:
-        arguments: build
-        build-root-directory: ./AndorsTrail

.gitignore

@@ -1 +0,0 @@
-/AndorsTrail/.idea/workspace.xml

AndorsTrail/.gitignore

@@ -1,30 +1,5 @@
-# Android ignores
-app/src/main/res
-app/src/main/assets
-gen/
-bin/
-target/
-local.properties
-app/build/intermediates/
-build/
-debug/
-release/
-.gradle/
-
-#IntelliJ
-.idea/
-out/production/
-out/test/
-*.iws
-*.ipr
-
-# Other
-.metadata
-.svn/
-
-
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
 .gradle
+.idea
 **/build/
 !src/**/build/
 
@@ -44,12 +19,4 @@ gradle-app.setting
 # Eclipse Core
 .project
 # JDT-specific (Eclipse Java Development Tools)
-.classpath
-#copied from  https://github.com/github/gitignore/blob/main/Gradle.gitignore
-
-
-/AndorsTrail/.gradle
-/AndorsTrail/gradle/wrapper
-/AndorsTrail/app/build/
-/AndorsTrail/app/debug/
-/AndorsTrail/app/release/
+.classpath

AndorsTrail/app/build.gradle

@@ -1,17 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    lintOptions{
-        baseline file("lint.xml")
-        abortOnError true
-    }
-    compileSdkVersion 30
+    compileSdkVersion 32
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.gpl.rpg.AndorsTrail"
         minSdkVersion 14
-        targetSdkVersion 30
+        targetSdkVersion 32
     }
 
     buildTypes {
@@ -25,27 +21,3 @@ android {
 dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 }
-
-task copyRes(type: Copy) {
-    description "Copies the res folder to the modules res folder (& renames .tmx to .xml)"
-    from "${rootDir}/res"
-    into "${projectDir}/src/main/res"
-    rename "(.*)\\.tmx", "\$1.xml"
-}
-
-task copyTranslation(type: Copy) {
-    description("Copies the translation files to the modules translations folder")
-    from "${rootDir}/assets/translation"
-    into "${projectDir}/src/main/assets/translation"
-}
-
-task cleanup(type: Delete) {
-    description("Deletes the assets/translation and the res folder from the modules folder")
-    delete "${projectDir}/src/main/res", "${projectDir}/src/main/assets/translation"
-}
-
-afterEvaluate {
-    preBuild.dependsOn project.tasks.copyRes
-    preBuild.dependsOn project.tasks.copyTranslation
-    clean.dependsOn project.tasks.cleanup
-}

AndorsTrail/app/lint.xml

@@ -9,7 +9,5 @@
     <issue id="IconLocation" severity="ignore" />
     <issue id="UnusedResources" severity="ignore" />
     <issue id="DefaultLocale" severity="ignore" />
-    <issue id="StringFormatInvalid" severity="ignore" />
-    <issue id="StringFormatMatches" severity="ignore" />
     <issue id="NewApi" severity="error" />
 </lint>

AndorsTrail/app/src/main/AndroidManifest.xml

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <manifest 
-	xmlns:android="http://schemas.android.com/apk/res/android" 
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
 	package="com.gpl.rpg.AndorsTrail"
-	android:versionCode="66"
-	android:versionName="0.8.2"
+	android:versionCode="64"
+	android:versionName="0.7.17"
 	android:installLocation="auto"
 	>
-	<uses-sdk 
-		android:minSdkVersion="4"
-		android:targetSdkVersion="30"
-		/>
-	
+
 	<supports-screens
 		android:smallScreens="true" 
 		android:normalScreens="true"
@@ -34,11 +31,11 @@
 		android:requestLegacyExternalStorage="true"
 		android:hasFragileUserData="true"
 		android:preserveLegacyExternalStorage="true"
-		>
+		tools:targetApi="30">
 		<activity 
 		    android:name="com.gpl.rpg.AndorsTrail.activity.StartScreenActivity"
 		    android:clearTaskOnLaunch="true"
-		    >
+			android:exported="true">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
@@ -46,7 +43,6 @@
 		</activity>
    		<activity 
 			android:name="com.gpl.rpg.AndorsTrail.activity.MainActivity"
-			android:label="@string/app_name" 
 			android:theme="@style/AndorsTrailTheme_Blue.NoBackground"
 			/>
 		<activity android:name="com.gpl.rpg.AndorsTrail.activity.HeroinfoActivity" />