Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 4f4d305

Browse files
authored
Updating module 'app' to Java 8 syntax (#308)
1 parent eba11f4 commit 4f4d305

File tree

7 files changed

+27
-31
lines changed

7 files changed

+27
-31
lines changed

app/build.gradle

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,14 @@ android {
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1919
}
2020
}
21+
22+
compileOptions {
23+
// Flag to enable support for the new language APIs
24+
coreLibraryDesugaringEnabled false
25+
// Sets Java compatibility to Java 8
26+
sourceCompatibility JavaVersion.VERSION_1_8
27+
targetCompatibility JavaVersion.VERSION_1_8
28+
}
2129
}
2230

2331
dependencies {

app/src/main/java/pub/devrel/easypermissions/sample/MainActivity.java

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
import android.Manifest;
1919
import android.content.Intent;
2020
import android.os.Bundle;
21-
import androidx.annotation.NonNull;
22-
import androidx.appcompat.app.AppCompatActivity;
2321
import android.util.Log;
24-
import android.view.View;
2522
import android.widget.Toast;
2623

24+
import androidx.annotation.NonNull;
25+
import androidx.appcompat.app.AppCompatActivity;
26+
2727
import java.util.List;
2828

2929
import pub.devrel.easypermissions.AfterPermissionGranted;
@@ -46,20 +46,10 @@ protected void onCreate(Bundle savedInstanceState) {
4646
setContentView(R.layout.activity_main);
4747

4848
// Button click listener that will request one permission.
49-
findViewById(R.id.button_camera).setOnClickListener(new View.OnClickListener() {
50-
@Override
51-
public void onClick(View v) {
52-
cameraTask();
53-
}
54-
});
49+
findViewById(R.id.button_camera).setOnClickListener(v -> cameraTask());
5550

5651
// Button click listener that will request two permissions.
57-
findViewById(R.id.button_location_and_contacts).setOnClickListener(new View.OnClickListener() {
58-
@Override
59-
public void onClick(View v) {
60-
locationAndContactsTask();
61-
}
62-
});
52+
findViewById(R.id.button_location_and_contacts).setOnClickListener(v -> locationAndContactsTask());
6353
}
6454

6555
private boolean hasCameraPermission() {

app/src/main/java/pub/devrel/easypermissions/sample/MainFragment.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
import android.view.ViewGroup;
99
import android.widget.Toast;
1010

11-
import java.util.List;
12-
1311
import androidx.annotation.NonNull;
1412
import androidx.fragment.app.Fragment;
13+
14+
import java.util.List;
15+
1516
import pub.devrel.easypermissions.AfterPermissionGranted;
1617
import pub.devrel.easypermissions.EasyPermissions;
1718

@@ -33,12 +34,7 @@ public View onCreateView(LayoutInflater inflater,
3334
View v = inflater.inflate(R.layout.fragment_main, container);
3435

3536
// Button click listener
36-
v.findViewById(R.id.button_sms).setOnClickListener(new View.OnClickListener() {
37-
@Override
38-
public void onClick(View v) {
39-
smsTask();
40-
}
41-
});
37+
v.findViewById(R.id.button_sms).setOnClickListener(v1 -> smsTask());
4238

4339
return v;
4440
}

easypermissions/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ android {
2727
includeAndroidResources = true
2828
}
2929
}
30+
3031
}
3132

3233
junitJacoco {

easypermissions/src/test/java/pub/devrel/easypermissions/RationaleDialogClickListenerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.app.Activity;
55
import android.app.Dialog;
66
import android.content.DialogInterface;
7+
78
import androidx.fragment.app.Fragment;
89

910
import org.junit.Before;

easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/ActivityController.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import android.app.Activity;
44

5-
import java.util.concurrent.CompletableFuture;
6-
import java.util.concurrent.ExecutionException;
7-
85
import androidx.annotation.NonNull;
96
import androidx.test.core.app.ActivityScenario;
107

8+
import java.util.concurrent.CompletableFuture;
9+
import java.util.concurrent.ExecutionException;
10+
1111
/**
1212
* Helper class to allow starting Activity, similar to the Robolectric ActivityConroller.
1313
*/
@@ -24,8 +24,8 @@ public synchronized T resume() {
2424

2525
scenario.onActivity(new ActivityScenario.ActivityAction<T>() {
2626
@Override
27-
public void perform(@NonNull T Activity) {
28-
ActivityFuture.complete(Activity);
27+
public void perform(@NonNull T activity) {
28+
ActivityFuture.complete(activity);
2929
}
3030
});
3131

easypermissions/src/test/java/pub/devrel/easypermissions/testhelper/FragmentController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package pub.devrel.easypermissions.testhelper;
22

3-
import java.util.concurrent.CompletableFuture;
4-
import java.util.concurrent.ExecutionException;
5-
63
import androidx.annotation.NonNull;
74
import androidx.fragment.app.Fragment;
85
import androidx.fragment.app.testing.FragmentScenario;
96

7+
import java.util.concurrent.CompletableFuture;
8+
import java.util.concurrent.ExecutionException;
9+
1010
/**
1111
* Helper class to allow starting Fragments, similar to the old SupportFragmentController.
1212
*/

0 commit comments

Comments
 (0)