Skip to content
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.

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

Change to BSD 3-Clause license #117

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions .classpath

This file was deleted.

16 changes: 13 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
bin/*
gen/*
*.log
# Specifies intentionally untracked files to ignore when using Git.
# http://git-scm.com/docs/gitignore

# IntelliJ
.idea/
*.iml

# Gradle
.gradle/
build/
local.properties

# macOS
.DS_Store
33 changes: 0 additions & 33 deletions .project

This file was deleted.

30 changes: 30 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
BSD 3-Clause License

Copyright (c) 2010-2012, MIT
Copyright (c) 2012-2016, Nadav Aharony, Alan Gardner, and Cody Sumter
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of the copyright holder nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 changes: 10 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,14 @@ to your server.
Easily decrypt and merge many data files into
[one convenient database](https://github.com/funf-org/funf-core-android/wiki/ProcessingData).


# How to Build
The Funf project can be used as an Android library, or can be packaged as a jar file.
The typical method of using Funf is by using the Funf jar file. To build the funf jar
file, use the 'release' target of the Ant build script. (Make sure you have ant 1.8.*
or later installed.) Then, copy the jar file (bin/funf.jar) to the libs directory of your project.
The Android build scripts (Command line Ant or in Eclipse) will take care of compiling
the jar.

If you think that you will be making frequent changes to the Funf library, you may
want to integrate Funf as a library project.
To use it as an Android library, add this project as a library dependency of your
Android application project. See the Android documentation for integrating a
library project for
[Eclipse projects](http://developer.android.com/guide/developing/projects/projects-eclipse.html#ReferencingLibraryProject)
or via the
[command line](http://developer.android.com/guide/developing/projects/projects-cmdline.html#ReferencingLibraryProject).
The Funf project can be used as an Android library module, or can be packaged as a compiled ARR/JAR
file. The typical method of using Funf is by using an ARR/JAR file. See the [Android
documentation](https://developer.android.com/studio/projects/android-library.html) for building the
ARR/JAR file.

If you think that you will be making frequent changes to the Funf library, you may want to integrate
Funf as a library module. To use it as an Android library, add this project as a library dependency
of your Android application project. See the [Android
documentation](https://developer.android.com/studio/projects/android-library.html) for integrating a
library project.
19 changes: 0 additions & 19 deletions ant.properties

This file was deleted.

15 changes: 15 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
}
}

allprojects {
repositories {
jcenter()
}
}
83 changes: 0 additions & 83 deletions build.xml

This file was deleted.

94 changes: 0 additions & 94 deletions custom_rules.xml

This file was deleted.

12 changes: 0 additions & 12 deletions default.properties

This file was deleted.

22 changes: 22 additions & 0 deletions funf/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
apply plugin: 'com.android.library'

android {
compileSdkVersion 17
buildToolsVersion "25.0.2"

defaultConfig {
minSdkVersion 8
targetSdkVersion 14
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
}
}
}

dependencies {
compile 'com.google.code.gson:gson:2.1'
}
3 changes: 3 additions & 0 deletions funf/lint.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<lint>
</lint>
Loading