Skip to content

Update the Android Gradle plugin. #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
geeksploit wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Update the Android Gradle plugin. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4af4733
Update the Android Gradle plugin.
Sep 9, 2017
b7e1621
Fix access modifiers.
Sep 9, 2017
7f0922b
Update the Android Gradle plugin.
Sep 11, 2017
50eeb3b
Fix access modifiers.
Sep 11, 2017
acdc6b6
Update the Android Gradle plugin.
Sep 12, 2017
f8f793d
Fix access modifiers.
Sep 12, 2017
0d21cd8
Merge branch 'useful_fixes/update_gradle_plugin' into useful_fixes/re…
Sep 12, 2017
0aaa642
Merge branch 'useful_fixes/access_modifiers' into useful_fixes/release
Sep 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 2.1.06-Exercise-LoadA9Patch/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'org.robovm:robovm-gradle-plugin:1.8.0'
}
}
Expand Down
4 changes: 2 additions & 2 deletions 2.1.06-Exercise-LoadA9Patch/core/src/com/udacity/gamedev/ninepatch/NinePatchDemo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class NinePatchDemo extends ApplicationAdapter {
private static final float TEST_SIZE_1 = 20;
private static final float TEST_SIZE_2 = 40;

SpriteBatch batch;
FitViewport viewport;
private SpriteBatch batch;
private FitViewport viewport;

// TODO: Add a Texture for the raw platform image

Expand Down
2 changes: 1 addition & 1 deletion 2.1.07-Exercise-Animations/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'org.robovm:robovm-gradle-plugin:1.8.0'
}
}
Expand Down
22 changes: 11 additions & 11 deletions 2.1.07-Exercise-Animations/core/src/com/udacity/gamedev/animations/Animations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ public class Animations extends ApplicationAdapter {

private static final float WALK_LOOP_FRAME_DURATION = 0.1f;

SpriteBatch batch;
ExtendViewport viewport;
private SpriteBatch batch;
private ExtendViewport viewport;

Animation walkLoop;
long startTime;
private Animation walkLoop;
private long startTime;

Animation explosion;
DelayedRemovalArray<OneShotAnimation> explosions;
private Animation explosion;
private DelayedRemovalArray<OneShotAnimation> explosions;

@Override
public void create() {
Expand Down Expand Up @@ -141,12 +141,12 @@ private void updateExplosions() {
}


class OneShotAnimation {
public final Vector2 position;
private class OneShotAnimation {
final Vector2 position;
private final Animation animation;
private final long startTimeNanos;

public OneShotAnimation(Animation animation, Vector2 position, long startTimeNanos) {
OneShotAnimation(Animation animation, Vector2 position, long startTimeNanos) {
this.animation = animation;
this.position = position;
this.startTimeNanos = startTimeNanos;
Expand All @@ -156,11 +156,11 @@ private float elapsedTime() {
return MathUtils.nanoToSec * (TimeUtils.nanoTime() - startTimeNanos);
}

public TextureRegion getFrame() {
TextureRegion getFrame() {
return animation.getKeyFrame(elapsedTime());
}

public boolean isAnimationFinished() {
boolean isAnimationFinished() {
return animation.isAnimationFinished(elapsedTime());
}

Expand Down
2 changes: 1 addition & 1 deletion 2.1.08-Exercise-CreatingATextureAtlas/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ buildscript {
}
dependencies {
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:2.2.3'
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'org.robovm:robovm-gradle-plugin:1.8.0'
// TODO: Add buildscript dependency on gdx-tools
classpath "com.badlogicgames.gdx:gdx-tools:1.7.0"
Expand Down
4 changes: 2 additions & 2 deletions ...CreatingATextureAtlas/core/src/com/udacity/gamedev/textureatlas/TextureAtlasExercise.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

public class TextureAtlasExercise extends ApplicationAdapter implements AssetErrorListener {

public static final String TAG = TextureAtlasExercise.class.getName();
private static final String TAG = TextureAtlasExercise.class.getName();

private static final String ATLAS = "images/gigagal.pack.atlas";
private static final String STANDING_RIGHT = "standing-right";

// TODO: Add an AssetManager


SpriteBatch batch;
private SpriteBatch batch;

// TODO: Add an AtlasRegion to hold the standing right sprite

Expand Down