Skip to content

Commit 8b7d21a

Browse files
committed
Reduce Gradle and Android warning noise
1 parent dd814b6 commit 8b7d21a

File tree

7 files changed

+32
-27
lines changed

7 files changed

+32
-27
lines changed

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66
mavenCentral()
77
google()
88
maven {
9-
url "https://plugins.gradle.org/m2/"
9+
url = "https://plugins.gradle.org/m2/"
1010
}
1111
}
1212
dependencies {
@@ -121,7 +121,7 @@ task copyLibs(type: Copy){
121121
}
122122

123123
task dist(dependsOn: [':jme3-examples:dist', 'mergedJavadoc']){
124-
description 'Creates a jME3 examples distribution with all jme3 binaries, sources, javadoc and external libraries under ./dist'
124+
description = 'Creates a jME3 examples distribution with all jme3 binaries, sources, javadoc and external libraries under ./dist'
125125
}
126126

127127
def mergedJavadocSubprojects = [
@@ -242,4 +242,4 @@ if (skipPrebuildLibraries != "true" && buildNativeProjects != "true") {
242242

243243
assemble.dependsOn extractPrebuiltNatives
244244
}
245-
}
245+
}

common.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -93,26 +93,26 @@ task javadocJar(type: Jar, dependsOn: javadoc, description: 'Creates a jar from
9393
}
9494

9595
ext.pomConfig = {
96-
name POM_NAME
97-
description POM_DESCRIPTION
98-
url POM_URL
99-
inceptionYear POM_INCEPTION_YEAR
96+
name = POM_NAME
97+
description = POM_DESCRIPTION
98+
url = POM_URL
99+
inceptionYear = POM_INCEPTION_YEAR
100100
scm {
101-
url POM_SCM_URL
102-
connection POM_SCM_CONNECTION
103-
developerConnection POM_SCM_DEVELOPER_CONNECTION
101+
url = POM_SCM_URL
102+
connection = POM_SCM_CONNECTION
103+
developerConnection = POM_SCM_DEVELOPER_CONNECTION
104104
}
105105
licenses {
106106
license {
107-
name POM_LICENSE_NAME
108-
url POM_LICENSE_URL
109-
distribution POM_LICENSE_DISTRIBUTION
107+
name = POM_LICENSE_NAME
108+
url = POM_LICENSE_URL
109+
distribution = POM_LICENSE_DISTRIBUTION
110110
}
111111
}
112112
developers {
113113
developer {
114-
name 'jMonkeyEngine Team'
115-
id 'jMonkeyEngine'
114+
name = 'jMonkeyEngine Team'
115+
id = 'jMonkeyEngine'
116116
}
117117
}
118118
}
@@ -155,7 +155,7 @@ publishing {
155155
}
156156
url = POM_URL
157157
}
158-
version project.version
158+
version = project.version
159159
}
160160
}
161161

@@ -210,8 +210,8 @@ tasks.withType(Sign) {
210210
}
211211

212212
checkstyle {
213-
toolVersion libs.versions.checkstyle.get()
214-
configFile file("${gradle.rootProject.rootDir}/config/checkstyle/checkstyle.xml")
213+
toolVersion = libs.versions.checkstyle.get()
214+
configFile = file("${gradle.rootProject.rootDir}/config/checkstyle/checkstyle.xml")
215215
}
216216

217217
checkstyleMain {

jme3-android/src/main/java/com/jme3/app/AndroidHarness.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import android.content.DialogInterface;
66
import android.graphics.drawable.Drawable;
77
import android.graphics.drawable.NinePatchDrawable;
8+
import android.graphics.Point;
89
import android.opengl.GLSurfaceView;
910
import android.os.Bundle;
1011
import android.util.Log;
@@ -216,7 +217,9 @@ public void onCreate(Bundle savedInstanceState) {
216217
//TODO try to find a better way to get a hand on the resolution
217218
WindowManager wind = this.getWindowManager();
218219
Display disp = wind.getDefaultDisplay();
219-
Log.d("AndroidHarness", "Resolution from Window, width:" + disp.getWidth() + ", height: " + disp.getHeight());
220+
Point displaySize = new Point();
221+
disp.getSize(displaySize);
222+
Log.d("AndroidHarness", "Resolution from Window, width:" + displaySize.x + ", height: " + displaySize.y);
220223

221224
// Create Settings
222225
logger.log(Level.FINE, "Creating settings");
@@ -232,7 +235,7 @@ public void onCreate(Bundle savedInstanceState) {
232235
settings.setSamples(eglSamples);
233236
settings.setStencilBits(eglStencilBits);
234237

235-
settings.setResolution(disp.getWidth(), disp.getHeight());
238+
settings.setResolution(displaySize.x, displaySize.y);
236239
settings.setAudioRenderer(audioRendererType);
237240

238241
settings.setFrameRate(frameRate);
@@ -410,9 +413,9 @@ public void layoutDisplay() {
410413
frameLayout = new FrameLayout(this);
411414
splashImageView = new ImageView(this);
412415

413-
Drawable drawable = this.getResources().getDrawable(splashPicID);
416+
Drawable drawable = splashImageView.getContext().getDrawable(splashPicID);
414417
if (drawable instanceof NinePatchDrawable) {
415-
splashImageView.setBackgroundDrawable(drawable);
418+
splashImageView.setBackground(drawable);
416419
} else {
417420
splashImageView.setImageResource(splashPicID);
418421
}

jme3-android/src/main/java/com/jme3/app/AndroidHarnessFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
*
7171
* @author iwgeric
7272
*/
73+
@SuppressWarnings("deprecation")
7374
public class AndroidHarnessFragment extends Fragment implements
7475
TouchListener, DialogInterface.OnClickListener, View.OnLayoutChangeListener, SystemListener {
7576
private static final Logger logger = Logger.getLogger(AndroidHarnessFragment.class.getName());
@@ -494,9 +495,9 @@ public void createLayout() {
494495
if (splashPicID != 0) {
495496
splashImageView = new ImageView(getActivity());
496497

497-
Drawable drawable = getResources().getDrawable(splashPicID);
498+
Drawable drawable = splashImageView.getContext().getDrawable(splashPicID);
498499
if (drawable instanceof NinePatchDrawable) {
499-
splashImageView.setBackgroundDrawable(drawable);
500+
splashImageView.setBackground(drawable);
500501
} else {
501502
splashImageView.setImageResource(splashPicID);
502503
}

jme3-android/src/main/java/com/jme3/system/android/JmeAndroidSystem.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ public void writeImageFile(OutputStream outStream, String format, ByteBuffer ima
7575

7676

7777
@Override
78+
@SuppressWarnings("deprecation")
7879
public JmeContext newContext(AppSettings settings, Type contextType) {
7980
if (settings.getAudioRenderer() == null) {
8081
audioRendererType = null;

jme3-android/src/main/java/com/jme3/system/android/OGLESContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,8 @@ public void requestDialog(
493493
public void run() {
494494
final FrameLayout layoutTextDialogInput = new FrameLayout(view.getContext());
495495
final EditText editTextDialogInput = new EditText(view.getContext());
496-
editTextDialogInput.setWidth(LayoutParams.FILL_PARENT);
497-
editTextDialogInput.setHeight(LayoutParams.FILL_PARENT);
496+
editTextDialogInput.setWidth(LayoutParams.MATCH_PARENT);
497+
editTextDialogInput.setHeight(LayoutParams.MATCH_PARENT);
498498
editTextDialogInput.setPadding(20, 20, 20, 20);
499499
editTextDialogInput.setGravity(Gravity.FILL_HORIZONTAL);
500500
//editTextDialogInput.setImeOptions(EditorInfo.IME_FLAG_NO_EXTRACT_UI);

jme3-core/src/test/java/com/jme3/material/plugins/J3MLoaderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.mockito.Mockito;
2020
import org.mockito.junit.MockitoJUnitRunner;
2121

22-
import static org.mockito.Matchers.any;
22+
import static org.mockito.ArgumentMatchers.any;
2323
import static org.mockito.Mockito.verify;
2424
import static org.junit.Assert.*;
2525
import static org.mockito.Mockito.when;

0 commit comments

Comments
 (0)