Java: Rename integration test directories.

We are no longer bound to the platform-specific directories, so simplify the test organization.
If you don't want this change, just skip merging this PR. It's purely optional.

I kept the platform-specific directories around under `kotlin`,
but you could also easily merge all these together if you find them unhelpful.
I'll leave that change to you.

java/ql/integration-tests/java/android-sample-old-style/README

@@ -0,0 +1 @@
+The difference between these old-style Android tests and those without the old-style suffix is that the old-style tests use com.android.tools.build in their top-level build script as shown in the example at https://developer.android.com/studio/build/#top-level before February 2022, whereas the new-style tests only refer to com.android.application and com.android.library as shown in the updated examples published in February 2022.

java/ql/integration-tests/java/android-sample-old-style/build.gradle

@@ -0,0 +1,44 @@
+buildscript {
+
+    /**
+     * The repositories block configures the repositories Gradle uses to
+     * search or download the dependencies. Gradle pre-configures support for remote
+     * repositories such as JCenter, Maven Central, and Ivy. You can also use local
+     * repositories or define your own remote repositories. The code below defines
+     * JCenter as the repository Gradle should use to look for its dependencies.
+     *
+     * New projects created using Android Studio 3.0 and higher also include
+     * Google's Maven repository.
+     */
+
+    repositories {
+        google()
+        jcenter()
+    }
+
+    /**
+     * The dependencies block configures the dependencies Gradle needs to use
+     * to build your project. The following line adds Android plugin for Gradle
+     * version 7.0.0 as a classpath dependency.
+     */
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:7.0.0'
+    }
+}
+
+/**
+ * The allprojects block is where you configure the repositories and
+ * dependencies used by all modules in your project, such as third-party plugins
+ * or libraries. However, you should configure module-specific dependencies in
+ * each module-level build.gradle file. For new projects, Android Studio
+ * includes JCenter and Google's Maven repository by default, but it does not
+ * configure any dependencies (unless you select a template that requires some).
+ */
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}

java/ql/integration-tests/java/android-sample-old-style/project/build.gradle

@@ -0,0 +1,62 @@
+/**
+ * The first line in the build configuration applies the Android Gradle plugin
+ * to this build and makes the android block available to specify
+ * Android-specific build options.
+ */
+
+plugins {
+    id 'com.android.application'
+}
+
+/**
+ * The android block is where you configure all your Android-specific
+ * build options.
+ */
+
+android {
+
+    /**
+     * The app's namespace. Used primarily to access app resources.
+     */
+
+    namespace 'com.github.androidsample'
+
+    /**
+     * compileSdk specifies the Android API level Gradle should use to
+     * compile your app. This means your app can use the API features included in
+     * this API level and lower.
+     */
+
+    compileSdk 33
+
+    /**
+     * The defaultConfig block encapsulates default settings and entries for all
+     * build variants and can override some attributes in main/AndroidManifest.xml
+     * dynamically from the build system. You can configure product flavors to override
+     * these values for different versions of your app.
+     */
+
+    defaultConfig {
+
+        // Uniquely identifies the package for publishing.
+        applicationId 'com.github.androidsample'
+
+        // Defines the minimum API level required to run the app.
+        minSdk 21
+
+        // Specifies the API level used to test the app.
+        targetSdk 33
+
+        // Defines the version number of your app.
+        versionCode 1
+
+        // Defines a user-friendly version name for your app.
+        versionName "1.0"
+    }
+
+    variantFilter { variant -> if (variant.buildType.name == "debug") { setIgnore(true) } }
+
+    lintOptions {
+        disable "Instantiatable"
+    }
+}

java/ql/integration-tests/java/android-sample-old-style/project/src/main/AndroidManifest.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.github.androidsample">
+    <application android:label="AndroidSample">
+        <activity android:name="Main" android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest>

java/ql/integration-tests/java/android-sample-old-style/project/src/main/java/com/github/androidsample/Main.java

@@ -0,0 +1,11 @@
+package com.github.androidsample;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class Main extends Activity
+{
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+    }
+}

java/ql/integration-tests/java/android-sample-old-style/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = "Android Sample"
+include ':project'

java/ql/integration-tests/java/android-sample-old-style/source_archive.expected

@@ -0,0 +1,29 @@
+.gradle/7.4/dependencies-accessors/gc.properties
+.gradle/7.4/gc.properties
+.gradle/buildOutputCleanup/cache.properties
+.gradle/vcs-1/gc.properties
+gradle/wrapper/gradle-wrapper.properties
+project/build/generated/source/buildConfig/release/com/github/androidsample/BuildConfig.java
+project/build/intermediates/app_metadata/release/app-metadata.properties
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/module.xml
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-dependencies.xml
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-mainArtifact-libraries.xml
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-testArtifact-dependencies.xml
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/release-testArtifact-libraries.xml
+project/build/intermediates/incremental/lintVitalAnalyzeRelease/release.xml
+project/build/intermediates/incremental/lintVitalRelease/module.xml
+project/build/intermediates/incremental/lintVitalRelease/release-mainArtifact-dependencies.xml
+project/build/intermediates/incremental/lintVitalRelease/release-mainArtifact-libraries.xml
+project/build/intermediates/incremental/lintVitalRelease/release.xml
+project/build/intermediates/incremental/mergeReleaseAssets/merger.xml
+project/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml
+project/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
+project/build/intermediates/incremental/mergeReleaseResources/merger.xml
+project/build/intermediates/incremental/mergeReleaseShaders/merger.xml
+project/build/intermediates/lint_vital_partial_results/release/out/lint-issues-release.xml
+project/build/intermediates/merged_manifest/release/AndroidManifest.xml
+project/build/intermediates/merged_manifests/release/AndroidManifest.xml
+project/build/intermediates/packaged_manifests/release/AndroidManifest.xml
+project/src/main/AndroidManifest.xml
+project/src/main/java/com/github/androidsample/Main.java
+test-db/log/ext/javac.properties

java/ql/integration-tests/java/android-sample-old-style/test.py

@@ -0,0 +1,2 @@
+def test(codeql, use_java_11, java, gradle_7_4, android_sdk):
+    codeql.database.create()