Upgrade build tools and bump to latest libpd (#124)

tkirshboim · web-flow · commit ead6dad207c9 · 2023-06-15T20:32:43.000+02:00
* Upgrade build tools * Fix #118 - Update libpd submodule reference * Raise minimum API level to 28 due to 'glob' function usage in libpd
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -16,7 +16,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'adopt'
     - run: |
         git submodule sync --recursive
         git submodule update --init --recursive
diff --git a/.gitmodules b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "PdCore/src/main/jni/libpd"]
 	path = PdCore/src/main/jni/libpd
-	url = git://github.com/libpd/libpd.git
+	url = https://github.com/libpd/libpd.git
diff --git a/CircleOfFifths/build.gradle b/CircleOfFifths/build.gradle
@@ -8,6 +8,7 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion
+    namespace = 'org.puredata.android.fifths'
 
     defaultConfig {
         applicationId "org.puredata.android.fifths"
diff --git a/CircleOfFifths/src/org/puredata/android/fifths/CircleOfFifths.java b/CircleOfFifths/src/org/puredata/android/fifths/CircleOfFifths.java
@@ -129,22 +129,17 @@ public void setTop(int top) {
 	@Override
 	public void onClick(View v) {
 		int newOption;
-		switch (v.getId()) {
-		case R.id.domdim:
+		int id = v.getId();
+		if (id == R.id.domdim) {
 			newOption = 2;
-			break;
-		case R.id.majmin:
+		} else if (id == R.id.majmin) {
 			newOption = 4;
-			break;
-		case R.id.sixth:
+		} else if (id == R.id.sixth) {
 			newOption = 6;
-			break;
-		case R.id.susp:
+		} else if (id == R.id.susp) {
 			newOption = 8;
-			break;
-		default:
+		} else {
 			newOption = 0;
-			break;
 		}
 		if (option == newOption) {
 			resetOptions();
@@ -168,17 +163,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		AlertDialog.Builder ad = new AlertDialog.Builder(this);
-		switch (item.getItemId()) {
-		case R.id.about_item:
+		int itemId = item.getItemId();
+		if (itemId == R.id.about_item) {
 			ad.setTitle(R.string.about_title);
 			ad.setMessage(R.string.about_msg);
-			break;
-		case R.id.help_item:
+		} else if (itemId == R.id.help_item) {
 			ad.setTitle(R.string.help_title);
 			ad.setMessage(R.string.help_msg);
-			break;
-		default:
-			break;
 		}
 		ad.setNeutralButton(android.R.string.ok, null);
 		ad.setCancelable(true);
diff --git a/PdCore/build.gradle b/PdCore/build.gradle
@@ -18,6 +18,7 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion
+    namespace = 'org.puredata.android.service'
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/PdCore/src/main/jni/Application.mk b/PdCore/src/main/jni/Application.mk
@@ -1,3 +1,3 @@
-APP_PLATFORM := android-17
+APP_PLATFORM := android-28
 APP_OPTIM := release
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
diff --git a/PdCore/src/main/jni/libpd b/PdCore/src/main/jni/libpd
@@ -1 +1 @@
-Subproject commit 39220486fd43410e4c468a9e2adc7eb94597cc96
+Subproject commit fb174959373d18d8bd135f6a3abf86ded82be534
diff --git a/PdTest/build.gradle b/PdTest/build.gradle
@@ -11,6 +11,7 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion
+    namespace = 'org.puredata.android.test'
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/PdTest/src/org/puredata/android/test/PdTest.java b/PdTest/src/org/puredata/android/test/PdTest.java
@@ -231,17 +231,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.about_item:
+		if (item.getItemId() == R.id.about_item) {
 			AlertDialog.Builder ad = new AlertDialog.Builder(this);
 			ad.setTitle(R.string.about_title);
 			ad.setMessage(R.string.about_msg);
 			ad.setNeutralButton(android.R.string.ok, null);
 			ad.setCancelable(true);
 			ad.show();
-			break;
-		default:
-			break;
 		}
 		return true;
 	}
@@ -258,29 +254,25 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String permissi
 
 	@Override
 	public void onClick(View v) {
-		switch (v.getId()) {
-		case R.id.play_button:
+		int id = v.getId();
+		if (id == R.id.play_button) {
 			if (pdService.isRunning()) {
 				stopAudio();
 			} else if (recordAudioPermissionGranted()) {
 				startAudio();
 			} else {
 				requestAudioPermission();
 			}
-		case R.id.left_box:
+
+			PdBase.sendFloat("left", left.isChecked() ? 1 : 0);
+		} else if (id == R.id.left_box) {
 			PdBase.sendFloat("left", left.isChecked() ? 1 : 0);
-			break;
-		case R.id.right_box:
+		} else if (id == R.id.right_box) {
 			PdBase.sendFloat("right", right.isChecked() ? 1 : 0);
-			break;
-		case R.id.mic_box:
+		} else if (id == R.id.mic_box) {
 			PdBase.sendFloat("mic", mic.isChecked() ? 1 : 0);
-			break;
-		case R.id.pref_button:
+		} else if (id == R.id.pref_button) {
 			startActivity(new Intent(this, PdPreferences.class));
-			break;
-		default:
-			break;
 		}
 	}
 
diff --git a/ScenePlayer/build.gradle b/ScenePlayer/build.gradle
@@ -10,6 +10,7 @@ android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
     ndkVersion rootProject.ndkVersion
+    namespace = 'org.puredata.android.scenes'
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/ScenePlayer/src/com/lamerman/FileDialog.java b/ScenePlayer/src/com/lamerman/FileDialog.java
@@ -155,7 +155,9 @@ protected void onListItemClick(ListView l, View v, int position, long id) {
 				lastPositions.put(currentPath, position);
 				getDir(path.get(position));
 			} else {
-				new AlertDialog.Builder(this).setIcon(R.drawable.icon).setTitle(
+				new AlertDialog.Builder(this)
+						.setIcon(org.puredata.android.service.R.drawable.icon)
+						.setTitle(
 						"[" + selectedFile.getName() + "] "
 						+ getText(R.string.cant_read_folder))
 						.setPositiveButton("OK",
diff --git a/ScenePlayer/src/org/puredata/android/scenes/SceneSelection.java b/ScenePlayer/src/org/puredata/android/scenes/SceneSelection.java
@@ -217,17 +217,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
 		AlertDialog.Builder ad = new AlertDialog.Builder(this);
-		switch (item.getItemId()) {
-		case R.id.selection_about_item:
+		int itemId = item.getItemId();
+		if (itemId == R.id.selection_about_item) {
 			ad.setTitle(R.string.selection_about_title);
 			ad.setMessage(R.string.selection_about_msg);
-			break;
-		case R.id.selection_help_item:
+		} else if (itemId == R.id.selection_help_item) {
 			ad.setTitle(R.string.selection_help_title);
 			ad.setMessage(R.string.selection_help_msg);
-			break;
-		default:
-			break;
 		}
 		ad.setNeutralButton(android.R.string.ok, null);
 		ad.setCancelable(true);
diff --git a/Voice-O-Rama/build.gradle b/Voice-O-Rama/build.gradle
@@ -7,6 +7,7 @@ dependencies {
 android {
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    namespace = 'at.or.at.voiceorama'
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
diff --git a/Voice-O-Rama/src/at/or/at/voiceorama/VoiceORama.java b/Voice-O-Rama/src/at/or/at/voiceorama/VoiceORama.java
@@ -207,17 +207,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.about_item:
+		if (item.getItemId() == R.id.about_item) {
 			AlertDialog.Builder ad = new AlertDialog.Builder(this);
 			ad.setTitle(R.string.about_title);
 			ad.setMessage(R.string.about_msg);
 			ad.setNeutralButton(android.R.string.ok, null);
 			ad.setCancelable(true);
 			ad.show();
-			break;
-		default:
-			break;
 		}
 		return true;
 	}
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }
 
@@ -39,9 +39,9 @@ allprojects {
 }
 
 ext {
-    minSdkVersion = 17
-    compileSdkVersion = 30
-    buildToolsVersion = '30.0.2'
+    minSdkVersion = 28
+    compileSdkVersion = 34
+    buildToolsVersion = '34.0.0'
     androidxLegacySupportVersion = '1.0.0'
-    ndkVersion = '21.4.7075529' // https://developer.android.com/ndk/downloads#lts-downloads
+    ndkVersion = '25.2.9519653' // https://developer.android.com/ndk/downloads#lts-downloads
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
diff --git a/gradlew.bat b/gradlew.bat
