Remove Gradle and Android assets. Add version number to justcheckers main package.
This commit is contained in:
parent
b1a0024edf
commit
1a23686e48
|
@ -1,25 +0,0 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
package="org.justcheckers.android"
|
|
||||||
android:versionCode="1"
|
|
||||||
android:versionName="0.1.1">
|
|
||||||
|
|
||||||
<application android:icon="@drawable/icon" android:label="@string/app_name"
|
|
||||||
android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
|
|
||||||
|
|
||||||
<activity android:name="org.justcheckers.android.MenuActivity">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
|
|
||||||
<activity android:name="org.justcheckers.android.GameActivity" />
|
|
||||||
<activity android:name="org.justcheckers.android.InfoActivity" />
|
|
||||||
<activity android:name="org.justcheckers.android.SettingsActivity" />
|
|
||||||
|
|
||||||
</application>
|
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="7" />
|
|
||||||
<uses-permission android:name="android.permission.INTERNET" />
|
|
||||||
</manifest>
|
|
|
@ -1,60 +0,0 @@
|
||||||
/*
|
|
||||||
Modular Gradle Build for justCheckers Android
|
|
||||||
---------------------------------------------
|
|
||||||
|
|
||||||
Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
|
|
||||||
License: AGPL v3.
|
|
||||||
|
|
||||||
Gradle docs:
|
|
||||||
http://www.gradle.org/docs/current/userguide/userguide_single.html
|
|
||||||
Gradle Android build docs:
|
|
||||||
https://sites.google.com/a/android.com/tools/tech-docs/new-build-system
|
|
||||||
*/
|
|
||||||
|
|
||||||
buildscript {
|
|
||||||
repositories {
|
|
||||||
maven { url 'http://repo1.maven.org/maven2' }
|
|
||||||
|
|
||||||
}
|
|
||||||
dependencies { classpath 'com.android.tools.build:gradle:0.3' }
|
|
||||||
}
|
|
||||||
|
|
||||||
apply plugin: 'android'
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justcheckers-android'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
// Androids!!!
|
|
||||||
android {
|
|
||||||
compileSdkVersion 14
|
|
||||||
sourceSets {
|
|
||||||
main {
|
|
||||||
manifest.srcFile 'AndroidManifest.xml'
|
|
||||||
java.srcDirs = ['src']
|
|
||||||
resources.srcDirs = ['src']
|
|
||||||
aild.srcDirs = ['src']
|
|
||||||
renderscript.srcDirs = ['src']
|
|
||||||
res.srcDirs = ['res']
|
|
||||||
assets.srcDirs = ['assets']
|
|
||||||
}
|
|
||||||
|
|
||||||
instrumentTest.setRoot('tests')
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup build script repositories starting with Maven repositories
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url 'http://repo1.maven.org/maven2'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dependency management
|
|
||||||
dependencies {
|
|
||||||
compile project(':core')
|
|
||||||
//compile 'org.slf4j:slf4j-android:1.6.1-RC1'
|
|
||||||
}
|
|
|
@ -1 +0,0 @@
|
||||||
sdk.dir=/home/dorian/Coding/android-sdk-linux
|
|
|
@ -1,34 +0,0 @@
|
||||||
-optimizationpasses 5
|
|
||||||
-dontusemixedcaseclassnames
|
|
||||||
-dontskipnonpubliclibraryclasses
|
|
||||||
-dontpreverify
|
|
||||||
-verbose
|
|
||||||
-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
|
|
||||||
|
|
||||||
-keep public class * extends android.app.Activity
|
|
||||||
-keep public class * extends android.app.Application
|
|
||||||
-keep public class * extends android.app.Service
|
|
||||||
-keep public class * extends android.content.BroadcastReceiver
|
|
||||||
-keep public class * extends android.content.ContentProvider
|
|
||||||
-keep public class com.android.vending.licensing.ILicensingService
|
|
||||||
|
|
||||||
-keepclasseswithmembers class * {
|
|
||||||
native <methods>;
|
|
||||||
}
|
|
||||||
|
|
||||||
-keepclasseswithmembers class * {
|
|
||||||
public <init>(android.content.Context, android.util.AttributeSet);
|
|
||||||
}
|
|
||||||
|
|
||||||
-keepclasseswithmembers class * {
|
|
||||||
public <init>(android.content.Context, android.util.AttributeSet, int);
|
|
||||||
}
|
|
||||||
|
|
||||||
-keepclassmembers enum * {
|
|
||||||
public static **[] values();
|
|
||||||
public static ** valueOf(java.lang.String);
|
|
||||||
}
|
|
||||||
|
|
||||||
-keep class * implements android.os.Parcelable {
|
|
||||||
public static final android.os.Parcelable$Creator *;
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
# This file is automatically generated by Android Tools.
|
|
||||||
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
|
|
||||||
#
|
|
||||||
# This file must be checked in Version Control Systems.
|
|
||||||
#
|
|
||||||
# To customize properties used by the Ant build system use,
|
|
||||||
# "ant.properties", and override values to adapt the script to your
|
|
||||||
# project structure.
|
|
||||||
|
|
||||||
# Project target.
|
|
||||||
target=android-14
|
|
Binary file not shown.
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
Before Width: | Height: | Size: 2.5 KiB |
23
build.gradle
23
build.gradle
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
Modular Gradle Build for justCheckers
|
|
||||||
---------------------------------------------
|
|
||||||
|
|
||||||
Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
|
|
||||||
License: AGPL v3.
|
|
||||||
|
|
||||||
Gradle docs:
|
|
||||||
http://www.gradle.org/docs/current/userguide/userguide_single.html
|
|
||||||
Gradle Android build docs:
|
|
||||||
https://sites.google.com/a/android.com/tools/tech-docs/new-build-system
|
|
||||||
*/
|
|
||||||
|
|
||||||
apply plugin: 'java'
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justcheckers'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
// TODO Add in extra targets for project setup or a simplified Gradle build API.
|
|
|
@ -1,32 +0,0 @@
|
||||||
/*
|
|
||||||
Gradle Build for justCheckers - Console
|
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
|
|
||||||
License: AGPL v3.
|
|
||||||
|
|
||||||
Gradle docs:
|
|
||||||
http://www.gradle.org/docs/current/userguide/userguide_single.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
apply plugin: 'java'
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justcheckers-console'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
// TODO Add in build for the terminal client.
|
|
||||||
// TODO Base of justcheckers-core
|
|
||||||
|
|
||||||
// TODO Look into potential terminal libraries...
|
|
||||||
/*
|
|
||||||
Ideas: http://stackoverflow.com/questions/1321308/whats-the-best-way-to-get-text-user-interfaces-ncurses-like-functionality-in
|
|
||||||
- Laterna: https://code.google.com/p/lanterna/
|
|
||||||
- jCurses: http://sourceforge.net/projects/javacurses/
|
|
||||||
- TUIAWT: http://bmsi.com/tuipeer/
|
|
||||||
- CHARVA: http://www.pitman.co.za/projects/charva/index.html
|
|
||||||
*/
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
/*
|
|
||||||
Gradle Build for justCheckers - Desktop
|
|
||||||
---------------------------------------
|
|
||||||
|
|
||||||
Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
|
|
||||||
License: AGPL v3.
|
|
||||||
|
|
||||||
Gradle docs:
|
|
||||||
http://www.gradle.org/docs/current/userguide/userguide_single.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
apply plugin: 'java'
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justcheckers-desktop'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
// TODO Add in build for the desktop client.
|
|
|
@ -0,0 +1 @@
|
||||||
|
__version__ = '0.3'
|
|
@ -1,13 +0,0 @@
|
||||||
import QtQuick 1.0
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
width: 800
|
|
||||||
height: 600
|
|
||||||
color: "red"
|
|
||||||
|
|
||||||
Text {
|
|
||||||
text: ""
|
|
||||||
anchors.centerIn: parent
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
132
web/build.gradle
132
web/build.gradle
|
@ -1,132 +0,0 @@
|
||||||
/*
|
|
||||||
Gradle Build for justCheckers - Web
|
|
||||||
---------------------------------------------
|
|
||||||
|
|
||||||
Author: Dorian Pula (dorian.pula@amber-penguin-software.ca)
|
|
||||||
License: AGPL v3.
|
|
||||||
|
|
||||||
Gradle docs:
|
|
||||||
http://www.gradle.org/docs/current/userguide/userguide_single.html
|
|
||||||
*/
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justCheckers'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
apply plugin: 'war'
|
|
||||||
apply plugin: 'jetty'
|
|
||||||
|
|
||||||
sourceCompatibility = 1.6
|
|
||||||
targetCompatibility = 1.6
|
|
||||||
|
|
||||||
// Description of the project
|
|
||||||
description = 'justcheckers-web'
|
|
||||||
version = '0.3'
|
|
||||||
|
|
||||||
|
|
||||||
project.ext {
|
|
||||||
appName = 'justcheckers-web'
|
|
||||||
appBaseName = "justcheckers"
|
|
||||||
|
|
||||||
hibernateVersion = '3.5.4-Final'
|
|
||||||
slf4jVersion = '1.7.5'
|
|
||||||
springVersion = '3.1.3.RELEASE'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Setup build script repositories starting with Maven repositories
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url 'http://repo1.maven.org/maven2'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Dependency management
|
|
||||||
dependencies {
|
|
||||||
|
|
||||||
compile project(':core')
|
|
||||||
|
|
||||||
// Spring Framework + SLF4J
|
|
||||||
compile ('org.springframework:spring-context:' + project.springVersion) {
|
|
||||||
exclude module: 'commons-logging'
|
|
||||||
}
|
|
||||||
compile 'log4j:log4j:1.2.16'
|
|
||||||
compile 'org.slf4j:jcl-over-slf4j:' + project.slf4jVersion
|
|
||||||
compile 'org.slf4j:slf4j-api:' + project.slf4jVersion
|
|
||||||
compile 'org.slf4j:slf4j-log4j12:' + project.slf4jVersion
|
|
||||||
|
|
||||||
compile 'org.springframework:spring-jdbc:' + project.springVersion
|
|
||||||
compile 'org.springframework:spring-orm:' + project.springVersion
|
|
||||||
compile 'org.springframework:spring-webmvc:' + project.springVersion
|
|
||||||
compile 'org.springframework:spring-parent:' + project.springVersion
|
|
||||||
|
|
||||||
// xstream
|
|
||||||
compile 'com.thoughtworks.xstream:xstream:1.4.4'
|
|
||||||
|
|
||||||
// Hibernate + C3P0
|
|
||||||
compile 'org.hibernate:hibernate:' + project.hibernateVersion
|
|
||||||
compile 'org.hibernate:hibernate-annotations:' + project.hibernateVersion
|
|
||||||
compile 'org.hibernate:hibernate-c3p0:' + project.hibernateVersion
|
|
||||||
compile 'javassist:javassist:3.9.0.GA'
|
|
||||||
|
|
||||||
// FlexJson
|
|
||||||
compile 'net.sf.flexjson:flexjson:2.1'
|
|
||||||
|
|
||||||
// Javax Servlet and Mail APIs
|
|
||||||
providedCompile 'javax.servlet:servlet-api:2.5'
|
|
||||||
}
|
|
||||||
|
|
||||||
// At the end of day we just need a JAR and a WAR.
|
|
||||||
ext.sharedManifest = manifest {
|
|
||||||
|
|
||||||
attributes(
|
|
||||||
'App-Name' : project.appName,
|
|
||||||
'App-Version' : version,
|
|
||||||
'Build-User' : System.properties['user.name'],
|
|
||||||
'Build-Time' : new Date().format('yyyy-MMMM-dd HH:mm:ss'),
|
|
||||||
'Build-OS' : System.properties['os.name'] + ' - version ' + System.properties['os.version'],
|
|
||||||
'Build-Sys' : System.properties['os.arch'],
|
|
||||||
'Java-Version' : System.properties['java.version'],
|
|
||||||
'Java-Vendor' : System.properties['java.vendor'],
|
|
||||||
'Java-VM' :
|
|
||||||
System.properties['java.vm.vendor'] + ' ' + System.properties['java.vm.name'] + ' v'
|
|
||||||
+ System.properties['java.vm.version'])
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build the JAR.
|
|
||||||
jar {
|
|
||||||
enabled = true
|
|
||||||
includeEmptyDirs = false
|
|
||||||
manifest = sharedManifest
|
|
||||||
include '**/**.class'
|
|
||||||
exclude 'build/**'
|
|
||||||
}
|
|
||||||
|
|
||||||
// Build WAR files that include the JAR file. Add the resources back in.
|
|
||||||
war {
|
|
||||||
|
|
||||||
from 'webapp'
|
|
||||||
exclude 'WEB-INF/lib'
|
|
||||||
|
|
||||||
classpath = project.configurations.runtime - project.configurations.providedRuntime + jar.outputs.files
|
|
||||||
manifest = sharedManifest
|
|
||||||
|
|
||||||
includeEmptyDirs = false
|
|
||||||
into('WEB-INF/classes') {
|
|
||||||
from sourceSets.main.resources
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
jettyRun {
|
|
||||||
httpPort = 8080
|
|
||||||
contextPath = project.appBaseName
|
|
||||||
webAppSourceDirectory = new File('webapp')
|
|
||||||
}
|
|
||||||
|
|
||||||
// Run embedded Jetty setup.
|
|
||||||
jettyRunWar {
|
|
||||||
httpPort = 8080
|
|
||||||
contextPath = project.appBaseName
|
|
||||||
}
|
|
Loading…
Reference in New Issue