Skip to content

Upgrade to androidx #1

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
fredyk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Upgrade to androidx #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@
/build
/captures
.externalNativeBuild
.idea/codeStyles
/.idea/caches/
2 changes: 2 additions & 0 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 18 additions & 3 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 7 additions & 8 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,14 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
compileSdkVersion 30
defaultConfig {
applicationId "info.overrideandroid.connect4"
minSdkVersion 18
targetSdkVersion 25
targetSdkVersion 30
versionCode 3
versionName "1.2"
testInstrumentationRunner 'android.support.test.runner.AndroidJUnitRunner'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
}
lintOptions {
abortOnError false
Expand All @@ -27,12 +26,12 @@ android {
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:25.3.1'
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0'

// Unit testing dependencies
testCompile 'junit:junit:4.12'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2', {
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0', {
exclude group: 'com.android.support', module: 'support-annotations'
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/info/overrideandroid/connect4/activity/GameMenuActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package info.overrideandroid.connect4.activity;

import android.content.Intent;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.controller.GameMenuController;
import info.overrideandroid.connect4.rules.GameRules;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/info/overrideandroid/connect4/activity/GamePlayActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import android.content.DialogInterface;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.view.Menu;
import android.view.MenuItem;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.controller.GamePlayController;
import info.overrideandroid.connect4.rules.GameRules;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/activity/SplashActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.support.v7.app.AppCompatActivity;

import androidx.appcompat.app.AppCompatActivity;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.utils.Constants;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/ai/AiPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package info.overrideandroid.connect4.ai;

import android.support.annotation.NonNull;
import android.util.Log;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.BuildConfig;
import info.overrideandroid.connect4.board.BoardLogic;
import info.overrideandroid.connect4.controller.GamePlayController;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/board/BoardLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package info.overrideandroid.connect4.board;

import android.support.annotation.NonNull;
import android.util.Log;
import android.widget.ImageView;

import java.util.ArrayList;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.BuildConfig;
import info.overrideandroid.connect4.controller.GamePlayController;
import info.overrideandroid.connect4.rules.Player;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/controller/GameMenuController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package info.overrideandroid.connect4.controller;

import android.support.annotation.NonNull;
import android.view.View;
import android.widget.RadioGroup;
import android.widget.SeekBar;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.rules.GameRules;
import info.overrideandroid.connect4.rules.GameRules.Disc;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/info/overrideandroid/connect4/controller/GamePlayController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import android.content.Context;
import android.os.AsyncTask;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.Log;
import android.view.View;
import android.widget.ImageView;

import java.util.ArrayList;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import info.overrideandroid.connect4.BuildConfig;
import info.overrideandroid.connect4.activity.GamePlayActivity;
import info.overrideandroid.connect4.ai.AiPlayer;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/rules/GameRules.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package info.overrideandroid.connect4.rules;

import android.os.Bundle;
import android.support.annotation.NonNull;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.R;

/**
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/view/BoardView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package info.overrideandroid.connect4.view;

import android.content.Context;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.util.Log;
import android.view.View;
Expand All @@ -13,6 +12,7 @@

import java.util.ArrayList;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.BuildConfig;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.board.BoardLogic;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/info/overrideandroid/connect4/view/MenuView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package info.overrideandroid.connect4.view;

import android.content.Context;
import android.support.annotation.NonNull;
import android.util.AttributeSet;
import android.widget.RadioButton;
import android.widget.RadioGroup;
import android.widget.RelativeLayout;
import android.widget.SeekBar;

import androidx.annotation.NonNull;
import info.overrideandroid.connect4.R;
import info.overrideandroid.connect4.controller.GameMenuController;
import info.overrideandroid.connect4.rules.GameRules;
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.4.0-alpha7'
classpath 'com.android.tools.build:gradle:4.0.1'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand All @@ -15,6 +16,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}

Expand Down
2 changes: 2 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@

# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m

# When configured, Gradle will run in incubating parallel mode.
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Mon May 29 10:47:40 IST 2017
#Wed Sep 23 00:47:01 CEST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip