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

Commit 0768c3e

Browse files
SUPERCILEXsamtstern
authored andcommitted
Update deps and upgrade to Java 8 (#114)
1 parent 0807a3f commit 0768c3e

File tree

9 files changed

+21
-31
lines changed

9 files changed

+21
-31
lines changed

app/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ android {
2020
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2121
}
2222
}
23+
24+
compileOptions {
25+
sourceCompatibility JavaVersion.VERSION_1_8
26+
targetCompatibility JavaVersion.VERSION_1_8
27+
}
2328
}
2429

2530
dependencies {

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.os.Bundle;
66
import android.support.annotation.NonNull;
77
import android.util.Log;
8-
import android.view.View;
98

109
import java.util.List;
1110

@@ -25,13 +24,10 @@ protected void onCreate(Bundle savedInstanceState) {
2524
super.onCreate(savedInstanceState);
2625
setContentView(R.layout.activity_basic);
2726

28-
findViewById(R.id.button_request).setOnClickListener(new View.OnClickListener() {
29-
@Override
30-
public void onClick(View v) {
31-
// Request SMS permission
32-
EasyPermissions.requestPermissions(BasicActivity.this, "NEED SMS PLZ", 1001,
33-
Manifest.permission.READ_SMS);
34-
}
27+
findViewById(R.id.button_request).setOnClickListener(v -> {
28+
// Request SMS permission
29+
EasyPermissions.requestPermissions(BasicActivity.this, "NEED SMS PLZ", 1001,
30+
Manifest.permission.READ_SMS);
3531
});
3632
}
3733

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import android.support.annotation.NonNull;
2222
import android.support.v7.app.AppCompatActivity;
2323
import android.util.Log;
24-
import android.view.View;
2524
import android.widget.Toast;
2625

2726
import java.util.List;
@@ -43,20 +42,10 @@ protected void onCreate(Bundle savedInstanceState) {
4342
setContentView(R.layout.activity_main);
4443

4544
// Button click listener that will request one permission.
46-
findViewById(R.id.button_camera).setOnClickListener(new View.OnClickListener() {
47-
@Override
48-
public void onClick(View v) {
49-
cameraTask();
50-
}
51-
});
45+
findViewById(R.id.button_camera).setOnClickListener(v -> cameraTask());
5246

5347
// Button click listener that will request two permissions.
54-
findViewById(R.id.button_location_and_contacts).setOnClickListener(new View.OnClickListener() {
55-
@Override
56-
public void onClick(View v) {
57-
locationAndContactsTask();
58-
}
59-
});
48+
findViewById(R.id.button_location_and_contacts).setOnClickListener(v -> locationAndContactsTask());
6049
}
6150

6251
@AfterPermissionGranted(RC_CAMERA_PERM)

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ public View onCreateView (LayoutInflater inflater, ViewGroup container, Bundle s
3131
View v = inflater.inflate(R.layout.fragment_main, container);
3232

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

4136
return v;
4237
}

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
}
55

66
dependencies {
7-
classpath 'com.android.tools.build:gradle:2.3.1'
7+
classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
88

99
classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
1010
classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'

easypermissions/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20+
21+
compileOptions {
22+
sourceCompatibility JavaVersion.VERSION_1_8
23+
targetCompatibility JavaVersion.VERSION_1_8
24+
}
2025
}
2126

2227
dependencies {

easypermissions/src/main/java/pub/devrel/easypermissions/AppSettingsDialog.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ private void startForResult(Intent intent) {
105105
/**
106106
* Display the built dialog.
107107
*/
108+
@SuppressWarnings("NewApi")
108109
public void show() {
109110
if (mNegativeListener == null) {
110-
//noinspection NewApi The Builder constructor prevents this
111111
startForResult(AppSettingsDialogHolderActivity.createShowDialogIntent(mContext, this));
112112
} else {
113113
// We can't pass the cancel listener to an activity so we default to old behavior it there is one.
@@ -130,6 +130,7 @@ void showDialog() {
130130
.show();
131131
}
132132

133+
@SuppressWarnings("NewApi")
133134
@Override
134135
public void onClick(DialogInterface dialog, int which) {
135136
// Create app settings intent
@@ -138,7 +139,6 @@ public void onClick(DialogInterface dialog, int which) {
138139
intent.setData(uri);
139140

140141
// Start for result
141-
//noinspection NewApi The Builder constructor prevents this
142142
startForResult(intent);
143143
}
144144

gradle/wrapper/gradle-wrapper.jar

571 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Tue Apr 11 22:50:43 SGT 2017
1+
#Thu May 11 19:29:35 PDT 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)