Skip to content

Commit 064742f

Browse files
committed
Updated to newest gradle version for the Android version
1 parent d014e4a commit 064742f

10 files changed

Lines changed: 48 additions & 38 deletions

File tree

47.1 KB
Binary file not shown.

Firj/.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Firj/.idea/gradle.xml

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Firj/.idea/jarRepositories.xml

Lines changed: 25 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Firj/.idea/misc.xml

Lines changed: 10 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Firj/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ buildscript {
77
jcenter()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.3.0'
10+
classpath 'com.android.tools.build:gradle:4.1.1'
1111

1212

1313
// NOTE: Do not place your application dependencies here; they belong

Firj/firj/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
3434

35-
testImplementation 'junit:junit:4.12'
35+
testImplementation 'junit:junit:4.13.1'
3636
androidTestImplementation 'com.android.support.test:runner:1.0.2'
3737
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
3838
}

Firj/firj/src/androidTest/java/uk/me/berndporr/firj/InstrumentedTest.java

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212

1313
/**
1414
* Instrumented test, which will execute on an Android device.
15-
*
16-
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
1715
*/
1816
@RunWith(AndroidJUnit4.class)
1917
public class InstrumentedTest {
@@ -48,28 +46,4 @@ public void firTest() {
4846
fir.release();
4947
}
5048

51-
@Test
52-
public void lmsTest() {
53-
final int nTaps = 10;
54-
Fir1 fir = new Fir1(nTaps);
55-
assertEquals(nTaps,fir.getTaps());
56-
double mu = 0.1;
57-
fir.setLearningRate(mu);
58-
double v = 0;
59-
for(int i = 0;i < 10;i++) {
60-
double e = 0;
61-
if (i < 5) {
62-
e = 1.0;
63-
}
64-
if (i > 5) {
65-
e = -1.0;
66-
}
67-
fir.lmsUpdate(e);
68-
v = fir.filter(1.0);
69-
Log.d(TAG,"Fir1: t="+i+",v="+v);
70-
}
71-
assertTrue(Math.round(v) < 1E-10);
72-
fir.release();
73-
}
74-
7549
}

Firj/firj/src/main/cpp/firwrapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Java_uk_me_berndporr_firj_Fir1_getInstance(JNIEnv *env,
1616
jdoubleArray coeffArray) {
1717

1818
double *coeffValues = env->GetDoubleArrayElements(coeffArray, 0);
19-
unsigned nTaps = (unsigned) env->GetArrayLength(coeffArray);
19+
auto nTaps = (unsigned) env->GetArrayLength(coeffArray);
2020

2121
Fir1 *fir = new Fir1(coeffValues, nTaps);
2222

@@ -40,7 +40,7 @@ jint Java_uk_me_berndporr_firj_Fir1_getTaps(JNIEnv *,
4040
jclass,
4141
jlong instance) {
4242
Fir1 *fir = (Fir1 *) instance;
43-
if (fir == NULL) return 0;
43+
if (fir == nullptr) return 0;
4444
return (jint)(fir->getTaps());
4545
}
4646

@@ -51,7 +51,7 @@ Java_uk_me_berndporr_firj_Fir1_filter(JNIEnv *,
5151
jlong instance,
5252
jdouble value) {
5353
Fir1 *fir = (Fir1 *) instance;
54-
if (fir == NULL) return 0;
54+
if (fir == nullptr) return 0;
5555
return fir->filter(value);
5656
}
5757

@@ -89,7 +89,7 @@ void Java_uk_me_berndporr_firj_Fir1_releaseInstance(JNIEnv *,
8989
jclass,
9090
jlong instance) {
9191
Fir1 *fir = (Fir1 *) instance;
92-
if (fir == NULL) return;
92+
if (fir == nullptr) return;
9393
delete fir;
9494
}
9595

Firj/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-all.zip

0 commit comments

Comments
 (0)