Updated to newest gradle version for the Android version

berndporr · Jan 17, 2021 · 064742f · 064742f
1 parent d014e4a
commit 064742f
Show file tree

Hide file tree

Showing 10 changed files with 48 additions and 38 deletions.
diff --git a/Firj/.idea/caches/gradle_models.ser b/Firj/.idea/caches/gradle_models.ser
diff --git a/Firj/.idea/compiler.xml b/Firj/.idea/compiler.xml
diff --git a/Firj/.idea/gradle.xml b/Firj/.idea/gradle.xml
diff --git a/Firj/.idea/jarRepositories.xml b/Firj/.idea/jarRepositories.xml
diff --git a/Firj/.idea/misc.xml b/Firj/.idea/misc.xml
diff --git a/Firj/build.gradle b/Firj/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0'
+        classpath 'com.android.tools.build:gradle:4.1.1'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/Firj/firj/build.gradle b/Firj/firj/build.gradle
@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.1'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 }
diff --git a/Firj/firj/src/androidTest/java/uk/me/berndporr/firj/InstrumentedTest.java b/Firj/firj/src/androidTest/java/uk/me/berndporr/firj/InstrumentedTest.java
@@ -12,8 +12,6 @@
 
 /**
  * Instrumented test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
  */
 @RunWith(AndroidJUnit4.class)
 public class InstrumentedTest {
@@ -48,28 +46,4 @@ public void firTest() {
         fir.release();
     }
 
-    @Test
-    public void lmsTest() {
-        final int nTaps = 10;
-        Fir1 fir = new Fir1(nTaps);
-        assertEquals(nTaps,fir.getTaps());
-        double mu = 0.1;
-        fir.setLearningRate(mu);
-        double v = 0;
-        for(int i = 0;i < 10;i++) {
-            double e = 0;
-            if (i < 5) {
-                e = 1.0;
-            }
-            if (i > 5) {
-                e = -1.0;
-            }
-            fir.lmsUpdate(e);
-            v = fir.filter(1.0);
-            Log.d(TAG,"Fir1: t="+i+",v="+v);
-        }
-        assertTrue(Math.round(v) < 1E-10);
-        fir.release();
-    }
-
 }
diff --git a/Firj/firj/src/main/cpp/firwrapper.cpp b/Firj/firj/src/main/cpp/firwrapper.cpp
@@ -16,7 +16,7 @@ Java_uk_me_berndporr_firj_Fir1_getInstance(JNIEnv *env,
                                            jdoubleArray coeffArray) {
 
     double *coeffValues = env->GetDoubleArrayElements(coeffArray, 0);
-    unsigned nTaps = (unsigned) env->GetArrayLength(coeffArray);
+    auto nTaps = (unsigned) env->GetArrayLength(coeffArray);
 
     Fir1 *fir = new Fir1(coeffValues, nTaps);
 
@@ -40,7 +40,7 @@ jint Java_uk_me_berndporr_firj_Fir1_getTaps(JNIEnv *,
                                             jclass,
                                             jlong instance) {
     Fir1 *fir = (Fir1 *) instance;
-    if (fir == NULL) return 0;
+    if (fir == nullptr) return 0;
     return (jint)(fir->getTaps());
 }
 
@@ -51,7 +51,7 @@ Java_uk_me_berndporr_firj_Fir1_filter(JNIEnv *,
                                       jlong instance,
                                       jdouble value) {
     Fir1 *fir = (Fir1 *) instance;
-    if (fir == NULL) return 0;
+    if (fir == nullptr) return 0;
     return fir->filter(value);
 }
 
@@ -89,7 +89,7 @@ void Java_uk_me_berndporr_firj_Fir1_releaseInstance(JNIEnv *,
                                                     jclass,
                                                     jlong instance) {
     Fir1 *fir = (Fir1 *) instance;
-    if (fir == NULL) return;
+    if (fir == nullptr) return;
     delete fir;
 }
 

diff --git a/Firj/gradle/wrapper/gradle-wrapper.properties b/Firj/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-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip