Fix Android app build #32

libpd · May 17, 2022 · 69cfebd · 69cfebd
2 parents 745c9a8 + 87b2b21
commit 69cfebd
Show file tree

Hide file tree

Showing 14 changed files with 232 additions and 208 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,3 +10,4 @@ captures
 *.so
 *.dylib
 *.pd_darwin
+AblLinkSample/app/.cxx
diff --git a/AblLinkSample/app/build.gradle b/AblLinkSample/app/build.gradle
@@ -5,14 +5,10 @@ android {
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
         applicationId "com.noisepages.nettoyeur.abllinksample"
-        minSdkVersion 10
-        targetSdkVersion 25
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        ndk {
-            abiFilters 'x86', 'armeabi', 'armeabi-v7a'
-        }
     }
     buildTypes {
         release {
@@ -28,10 +24,7 @@ android {
 }
 
 dependencies {
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
-    compile 'com.android.support:appcompat-v7:25.0.0'
-    compile project(':PdCore')
-    testCompile 'junit:junit:4.12'
+    implementation project(':PdCore')
+    implementation 'com.google.android.material:material:1.6.0'
+    implementation 'androidx.activity:activity:1.4.0'
 }
diff --git a/.../src/androidTest/java/com/noisepages/nettoyeur/abllinksample/ExampleInstrumentedTest.java b/.../src/androidTest/java/com/noisepages/nettoyeur/abllinksample/ExampleInstrumentedTest.java
diff --git a/AblLinkSample/app/src/main/AndroidManifest.xml b/AblLinkSample/app/src/main/AndroidManifest.xml
@@ -19,4 +19,5 @@
         <service android:name="org.puredata.android.service.PdService"/>
     </application>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 </manifest>
diff --git a/AblLinkSample/app/src/main/java/com/noisepages/nettoyeur/abllinksample/MainActivity.java b/AblLinkSample/app/src/main/java/com/noisepages/nettoyeur/abllinksample/MainActivity.java
@@ -20,14 +20,15 @@
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.os.IBinder;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.SeekBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;

diff --git a/AblLinkSample/app/src/main/res/values/styles.xml b/AblLinkSample/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.MaterialComponents.Light.DarkActionBar">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

diff --git a/AblLinkSample/app/src/test/java/com/noisepages/nettoyeur/abllinksample/ExampleUnitTest.java b/AblLinkSample/app/src/test/java/com/noisepages/nettoyeur/abllinksample/ExampleUnitTest.java
diff --git a/AblLinkSample/build.gradle b/AblLinkSample/build.gradle
@@ -2,21 +2,19 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.1'
-
-        // NOTE: Do not place your application dependencies here; they belong
-        // in the individual module build.gradle files
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
+        jcenter() // FIXME: com.noisepages.nettoyeur:midi
     }
 }
 
@@ -25,6 +23,9 @@ task clean(type: Delete) {
 }
 
 ext {
-    compileSdkVersion = 25
-    buildToolsVersion = '25.0.0'
+    minSdkVersion = 17
+    compileSdkVersion = 32
+    buildToolsVersion = '32.0.0'
+    androidxLegacySupportVersion = '1.0.0'
+    ndkVersion = '21.4.7075529' // https://developer.android.com/ndk/downloads#lts-downloads
 }
diff --git a/AblLinkSample/gradle.properties b/AblLinkSample/gradle.properties
@@ -10,7 +10,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx1536m
-
+android.useAndroidX=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

diff --git a/AblLinkSample/gradle/wrapper/gradle-wrapper.jar b/AblLinkSample/gradle/wrapper/gradle-wrapper.jar
diff --git a/AblLinkSample/gradle/wrapper/gradle-wrapper.properties b/AblLinkSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Mon Dec 28 10:00:20 PST 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,3 +10,4 @@ captures @@
     *.so
     *.dylib
     *.pd_darwin
+    AblLinkSample/app/.cxx