Modernize TuningForkMonitor app

See bug for justification.

API level 33 apps cannot be built with the Android Gradle Plugin specified (4.2.2). Upgrading the Android Gradle Plugin to 8.0 triggers a cascade of modernization requirements which this CL addresses.

Protobuf library was updated from 3.0.0 to 3.8.0. The Gradle configuration was updated to match the currently recommended format. The full (non-lite) version of the library was included which avoids the need to use simlinks to include the google/protobuf protos (a nice bonus is this makes the project easier to build on Windows where simlinks are unidiomatic). option=lite was set in the Gradle script to retain the use of lite accessors.

Kotlin was updated from 1.3.50 to 1.8.10. This requires changes to satisfy new restrictions around assigning const variables from non-final variables and requiring ‘when’ constructs to make a match in every case. In addition, Kotlin Synthetics were removed in 1.8, so their use to find views in layouts has been replaced with Jetpack View Binding.

AGP now requires that the launch activity is exported, but discourages the package from being specified there.

The structure of the build.gradle and settings.gradle files has been changed to the style recommended with the latest Android toolchain.

Bug: 302670554
Test: Manual
Change-Id: I5ec5864242b047cefda9abbf428f54846f5cad7f

24 files changed, 261 insertions, 241 deletions

diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/build.gradle b/games-performance-tuner/tools/TuningForkMonitor/app/build.gradle
index 4b6090ef..bab91f8d 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/build.gradle
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/build.gradle
@@ -1,19 +1,16 @@
-apply plugin: 'com.android.application'
-
-apply plugin: 'kotlin-android'
-
-apply plugin: 'kotlin-android-extensions'
-
-apply plugin: 'kotlinx-serialization'
-
-apply plugin: 'com.google.protobuf'
+plugins {
+    id 'com.android.application'
+    id 'org.jetbrains.kotlin.android'
+    id 'com.google.protobuf' version '0.9.4'
+}
 
 android {
-    compileSdkVersion 29
+    namespace 'com.google.tfmonitor'
+    compileSdk 34
     defaultConfig {
         applicationId "com.google.tfmonitor"
-        minSdkVersion 19
-        targetSdkVersion 29
+        minSdk 21
+        targetSdk 33
         versionCode 4
         versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -24,62 +21,40 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
-    sourceSets {
-        main.java.srcDirs += "${protobuf.generatedFilesBaseDir}/main/javalite"
-        main {
-            proto {
-                "tuningfork.proto"
-                "performanceparameters.proto"
-            }
-        }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-    lintOptions {
-        abortOnError false
+    kotlinOptions {
+        jvmTarget = '1.8'
     }
-
-    defaultConfig {
-        multiDexEnabled true
+    buildFeatures {
+        compose true
+        viewBinding true
     }
-
-    configurations {
-        implementation.exclude module:'protobuf-java'
+    composeOptions {
+        kotlinCompilerExtensionVersion '1.4.3'
     }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-serialization-runtime:0.14.0"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
-    implementation 'com.google.protobuf:protobuf-lite:3.0.0'
-    implementation 'com.google.api.grpc:proto-google-common-protos:1.18.1'
-
-    implementation 'androidx.recyclerview:recyclerview:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.activity:activity-compose:1.7.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.7.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.7.3'
+    implementation 'com.google.protobuf:protobuf-java:3.24.0'
+    implementation platform('androidx.compose:compose-bom:2023.09.02')
 }
 
 protobuf {
     protoc {
-        artifact = 'com.google.protobuf:protoc:3.0.0'
-    }
-    plugins {
-        javalite {
-            artifact = "com.google.protobuf:protoc-gen-javalite:3.0.0"
-        }
+        artifact = 'com.google.protobuf:protoc:3.8.0'
     }
     generateProtoTasks {
-        all().each { task ->
+        all().configureEach { task ->
             task.builtins {
-                remove java
-            }
-            task.plugins {
-                javalite {}
+                java {
+                    option 'lite'
+                }
             }
         }
     }
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/AndroidManifest.xml b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/AndroidManifest.xml
index e8b7b7d3..a3cb9ab9 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/AndroidManifest.xml
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

-<manifest xmlns:android="http://schemas.android.com/apk/res/android"

-    package="com.google.tfmonitor">

+<manifest xmlns:android="http://schemas.android.com/apk/res/android">

 

     <application

         android:allowBackup="true"

@@ -11,6 +10,7 @@
         android:theme="@style/AppTheme">

         <activity

             android:name=".MainActivity"

+            android:exported="true"

             android:label="@string/app_name"

             android:theme="@style/AppTheme.NoActionBar">

             <intent-filter>

diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/AppDetailFragment.kt b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/AppDetailFragment.kt
index 1df811df..294ec037 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/AppDetailFragment.kt
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/AppDetailFragment.kt
@@ -285,6 +285,6 @@ class AppDetailFragment : Fragment(), AdapterView.OnItemSelectedListener {
                 }
             }
 
-        private const val DEFAULT_COLOUR_ID = R.color.colorAccent
+        private val DEFAULT_COLOUR_ID = R.color.colorAccent
     }
 }
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/FieldItemRecyclerViewAdapter.kt b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/FieldItemRecyclerViewAdapter.kt
index 10fdc45f..1817419a 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/FieldItemRecyclerViewAdapter.kt
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/FieldItemRecyclerViewAdapter.kt
@@ -23,17 +23,17 @@ import android.view.ViewGroup
 import android.widget.TextView
 import com.google.protobuf.DescriptorProtos
 
+import com.google.tfmonitor.databinding.FragmentItemBinding;
 
 import com.google.tfmonitor.FieldItemFragment.OnListFragmentInteractionListener
 
-import kotlinx.android.synthetic.main.fragment_item.view.*
-
 class FieldItemRecyclerViewAdapter(
     private val mValues: List<DescriptorProtos.FieldDescriptorProto>,
     private val mListener: OnListFragmentInteractionListener?
 ) : RecyclerView.Adapter<FieldItemRecyclerViewAdapter.ViewHolder>() {
 
     private val mOnClickListener: View.OnClickListener
+    private var mBinding: FragmentItemBinding? = null;
 
     init {
         mOnClickListener = View.OnClickListener { v ->
@@ -45,9 +45,9 @@ class FieldItemRecyclerViewAdapter(
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(parent.context)
-            .inflate(R.layout.fragment_item, parent, false)
-        return ViewHolder(view)
+        mBinding = FragmentItemBinding.inflate(
+            LayoutInflater.from(parent.context), parent, false);
+        return ViewHolder(mBinding!!.root)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
@@ -64,8 +64,8 @@ class FieldItemRecyclerViewAdapter(
     override fun getItemCount(): Int = mValues.size
 
     inner class ViewHolder(val mView: View) : RecyclerView.ViewHolder(mView) {
-        val mNameView: TextView = mView.item_name
-        val mTypeView: TextView = mView.item_type
+        val mNameView: TextView = mBinding!!.itemName
+        val mTypeView: TextView = mBinding!!.itemType
         val mValueView: View? = null
 
         override fun toString(): String {
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/MainActivity.kt b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/MainActivity.kt
index 87623e1c..f01b9344 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/MainActivity.kt
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/MainActivity.kt
@@ -29,11 +29,13 @@ import androidx.core.content.FileProvider
 import androidx.lifecycle.ViewModelProvider
 import androidx.navigation.NavController
 import androidx.navigation.findNavController
+
+import com.google.tfmonitor.databinding.ActivityMainBinding
+
 import com.google.tuningfork.AppKey
 import com.google.tuningfork.Datastore
 import com.google.tuningfork.Deserializer
 import java.io.File
-import kotlinx.android.synthetic.main.activity_main.toolbar
 
 private class AsyncWebServer(
     val applicationContext: Context, val port: Int,
@@ -100,8 +102,9 @@ class MainActivity : AppCompatActivity(), AppChoiceFragment.OnFragmentInteractio
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
-        setSupportActionBar(toolbar)
+        val binding = ActivityMainBinding.inflate(layoutInflater);
+        setContentView(binding.root)
+        setSupportActionBar(binding.toolbar)
 
         databaseName = getString(R.string.database_name)
         datastore = Datastore(this.applicationContext, databaseName)
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
index 888a93a9..61f8d24f 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
+++ b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/java/com/google/tfmonitor/TuningForkRequestServer.kt
@@ -132,6 +132,7 @@ class TuningForkRequestServer(ip: String, port: Int, val requestListener: Reques
                                 userAgent += ua.trim { it <= ' ' }
                             }
                         }
+                    else -> throw AssertionError()
                 }
             }
 
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any.proto
deleted file mode 120000
index 6bfbaa0e..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/any.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any_test.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any_test.proto
deleted file mode 120000
index fd5e2102..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/any_test.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/any_test.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/api.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/api.proto
deleted file mode 120000
index 9a36e272..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/api.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/api.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/descriptor.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/descriptor.proto
deleted file mode 120000
index 88c75b59..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/descriptor.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/descriptor.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/duration.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/duration.proto
deleted file mode 120000
index 45f0e063..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/duration.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/duration.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/empty.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/empty.proto
deleted file mode 120000
index 2bc28653..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/empty.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/empty.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/field_mask.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/field_mask.proto
deleted file mode 120000
index 50278d93..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/field_mask.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/field_mask.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/source_context.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/source_context.proto
deleted file mode 120000
index fa9c9c85..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/source_context.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/source_context.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/struct.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/struct.proto
deleted file mode 120000
index 59ff895c..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/struct.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/struct.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/timestamp.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/timestamp.proto
deleted file mode 120000
index 7639f82b..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/timestamp.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/timestamp.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/type.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/type.proto
deleted file mode 120000
index 6455f4e5..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/type.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/type.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/wrappers.proto b/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/wrappers.proto
deleted file mode 120000
index 1c66bfde..00000000
--- a/games-performance-tuner/tools/TuningForkMonitor/app/src/main/proto/google/protobuf/wrappers.proto
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../../../../../third_party/protobuf-3.0.0/src/google/protobuf/wrappers.proto
\ No newline at end of file
diff --git a/games-performance-tuner/tools/TuningForkMonitor/build.gradle b/games-performance-tuner/tools/TuningForkMonitor/build.gradle
index 3614314b..644b650a 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/build.gradle
+++ b/games-performance-tuner/tools/TuningForkMonitor/build.gradle
@@ -1,34 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
-
-buildscript {
-    ext.kotlin_version = '1.3.50'
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
-        classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.8'
-        classpath 'com.google.gms:google-services:4.3.2'
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
-    gradle.projectsEvaluated {
-        tasks.withType(JavaCompile) {
-            options.compilerArgs << "-Xlint:unchecked"
-        }
-    }
-}
-
-task clean(type: Delete) {
-    delete rootProject.buildDir
+plugins {
+    id 'com.android.application' version '8.1.1' apply false
+    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
 }
diff --git a/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.jar b/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.jar
index f6b961fd..7454180f 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.jar
+++ b/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.jar
diff --git a/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.properties b/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.properties
index 2ae7f323..57b6262b 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.properties
+++ b/games-performance-tuner/tools/TuningForkMonitor/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists

 zipStoreBase=GRADLE_USER_HOME

 zipStorePath=wrapper/dists

-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip

diff --git a/games-performance-tuner/tools/TuningForkMonitor/gradlew b/games-performance-tuner/tools/TuningForkMonitor/gradlew
index cccdd3d5..1b6c7873 100755
--- a/games-performance-tuner/tools/TuningForkMonitor/gradlew
+++ b/games-performance-tuner/tools/TuningForkMonitor/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=$((i+1))
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/games-performance-tuner/tools/TuningForkMonitor/gradlew.bat b/games-performance-tuner/tools/TuningForkMonitor/gradlew.bat
index e95643d6..ac1b06f9 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/gradlew.bat
+++ b/games-performance-tuner/tools/TuningForkMonitor/gradlew.bat
@@ -1,3 +1,19 @@
+@rem

+@rem Copyright 2015 the original author or authors.

+@rem

+@rem Licensed under the Apache License, Version 2.0 (the "License");

+@rem you may not use this file except in compliance with the License.

+@rem You may obtain a copy of the License at

+@rem

+@rem      https://www.apache.org/licenses/LICENSE-2.0

+@rem

+@rem Unless required by applicable law or agreed to in writing, software

+@rem distributed under the License is distributed on an "AS IS" BASIS,

+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+@rem See the License for the specific language governing permissions and

+@rem limitations under the License.

+@rem

+

 @if "%DEBUG%" == "" @echo off

 @rem ##########################################################################

 @rem

@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0

 set APP_HOME=%DIRNAME%

 

+@rem Resolve any "." and ".." in APP_HOME to make it shorter.

+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi

+

 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.

-set DEFAULT_JVM_OPTS=

+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"

 

 @rem Find java.exe

 if defined JAVA_HOME goto findJavaFromJavaHome

 

 set JAVA_EXE=java.exe

 %JAVA_EXE% -version >NUL 2>&1

-if "%ERRORLEVEL%" == "0" goto init

+if "%ERRORLEVEL%" == "0" goto execute

 

 echo.

 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.

@@ -35,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%

 set JAVA_EXE=%JAVA_HOME%/bin/java.exe

 

-if exist "%JAVA_EXE%" goto init

+if exist "%JAVA_EXE%" goto execute

 

 echo.

 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%

@@ -45,28 +64,14 @@ echo location of your Java installation.
 

 goto fail

 

-:init

-@rem Get command-line arguments, handling Windows variants

-

-if not "%OS%" == "Windows_NT" goto win9xME_args

-

-:win9xME_args

-@rem Slurp the command line arguments.

-set CMD_LINE_ARGS=

-set _SKIP=2

-

-:win9xME_args_slurp

-if "x%~1" == "x" goto execute

-

-set CMD_LINE_ARGS=%*

-

 :execute

 @rem Setup the command line

 

 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

 

+

 @rem Execute Gradle

-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*

 

 :end

 @rem End local scope for the variables with windows NT shell

diff --git a/games-performance-tuner/tools/TuningForkMonitor/settings.gradle b/games-performance-tuner/tools/TuningForkMonitor/settings.gradle
index 025883c0..35dcb8af 100644
--- a/games-performance-tuner/tools/TuningForkMonitor/settings.gradle
+++ b/games-performance-tuner/tools/TuningForkMonitor/settings.gradle
@@ -1,2 +1,17 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
 include ':app'
 rootProject.name='Tuning Fork Monitor'