Skip to content

Commit

Permalink
Update whole project
Browse files Browse the repository at this point in the history
* Update build script
* Update Gradle
* Update SupportLibs
* Update all other libs to latest stable version
* Fix non compiling stuff
  • Loading branch information
gsantner committed Aug 26, 2017
1 parent 9abf34a commit 12f5635
Show file tree
Hide file tree
Showing 16 changed files with 232 additions and 80 deletions.
17 changes: 17 additions & 0 deletions .atomignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.git
.github
.gradle
.idea
build
gradle
.gitlab-ci.yml
*.iml
local.properties
settings.gradle
gradlew
gradlew.bat
LICENSE.md
app/build
app/.gitignore
app/pom.xml
app/proguard-rules.pro
112 changes: 81 additions & 31 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,52 +1,102 @@
.gradle
/local.properties
.DS_Store
##############
### Common ###
*~*
tmp/
*.tmp
*.bak
*.log

################
### Intellij ###
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
*.iml
/out/

.idea/
# if you remove the above rule, at least ignore the following:
## User-specific stuff:
# .idea/workspace.xml
# .idea/tasks.xml
# .idea/dictionaries
## Sensitive or high-churn files:
# .idea/dataSources.ids
# .idea/dataSources.xml
# .idea/sqlDataSources.xml
# .idea/dynamic.xml
# .idea/uiDesigner.xml

# Gradle:
# .idea/gradle.xml
# .idea/libraries

### Android template
## File-based project format:
*.ipr
*.iws

### Gradle ###
.gradle
build/
gradle-app.setting

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

###############
### Eclipse ###
#.project
*.pydevproject
.metadata
*.swp
*~.nib
.settings/
.loadpath
.externalToolBuilders/
*.launch
.cproject
.classpath
.factorypath
.buildpath
.target
.texlipse

############
### Java ###
*.class
.mtj.tmp/
*.jar
*.war
*.ear
hs_err_pid*

###############
### Android ###
# Built application files
*.apk
*.ap_

# Files for the Dalvik VM
*.dex

# Java class files
*.class

# Generated files
bin/
gen/

# Gradle files
build/
/*/build/

# Local configuration file (sdk path, etc)
local.properties

# Proguard folder generated by Eclipse
# Proguard
proguard/

# Log Files
*.log


### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm
*.iml

## Directory-based project format:
.idea/

## File-based project format:
*.ipr
*.iws

## Plugin-specific files:

# IntelliJ
/out/
# Android Studio Stuff
.navigation/
gen-external-apklibs

### Project ##
app/src/main/res/raw/changelog.*
app/src/main/res/raw/license.*
app/src/main/res/raw/readme.*
app/src/main/res/raw/contributors.*

# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar

8 changes: 8 additions & 0 deletions .hidden
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
circle.yml
gradle
gradle.properties
gradlew
gradlew.bat
local.properties
memetastic.iml
settings.gradle
100 changes: 80 additions & 20 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,46 +1,106 @@
apply plugin: 'com.android.application'

ext {
version_sdk = [
compileSdk: 26,
buildTools: "26.0.1",
minSdk : 16,
//targetSdk: compileSdk,
]
version_sdk.targetSdk = version_sdk.compileSdk
version_lib = [
appcompat : "26.0.0",
butterknife: "8.7.0",
]
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.2"
compileSdkVersion version_sdk.compileSdk
buildToolsVersion version_sdk.buildTools

defaultConfig {
minSdkVersion version_sdk.minSdk
targetSdkVersion version_sdk.targetSdk

versionCode 33
versionName "1.2.3"

applicationId "me.writeily"
minSdkVersion 16
targetSdkVersion 22
}

buildConfigField "boolean", "IS_TEST_BUILD", "false"
buildConfigField "boolean", "IS_GPLAY_BUILD", "false"
buildConfigField("String[]", "APPLICATION_LANGUAGES", '{' + getUsedAndroidLanguages().collect {"\"${it}\""}.join(",") + '}')
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

productFlavors {
flavorDefault {
}
flavorGplay {
buildConfigField "boolean", "IS_GPLAY_BUILD", "true"
}
flavorTest {
applicationId "me.writeily.test"
versionCode = Integer.parseInt(new Date().format('yyMMdd'))
versionName = new Date().format('yyMMdd')
buildConfigField "boolean", "IS_TEST_BUILD", "true"
}
}

lintOptions {
disable 'MissingTranslation'
}
}

repositories {
maven {
url "https://s3.amazonaws.com/repo.commonsware.com"
@SuppressWarnings(["UnnecessaryQualifiedReference", "SpellCheckingInspection"])
static String[] getUsedAndroidLanguages() {
Set<String> langs = new HashSet<>()
new File('.').eachFileRecurse(groovy.io.FileType.DIRECTORIES) {
final foldername = it.name
if (foldername.startsWith('values-') && !it.canonicalPath.contains("build" + File.separator + "intermediates")) {
new File(it.toString()).eachFileRecurse(groovy.io.FileType.FILES) {
if (it.name.toLowerCase().endsWith(".xml") && it.getCanonicalFile().getText('UTF-8').contains("<string")) {
langs.add(foldername.replace("values-", ""))

}
}
}
}
return langs.toArray(new String[langs.size()])
}

dependencies {
compile 'com.commonsware.cwac:anddown:0.3.0'
compile 'com.android.support:appcompat-v7:22.1.1'
compile 'com.android.support:recyclerview-v7:21.0.3'
compile 'com.android.support:palette-v7:+'
compile 'com.getbase:floatingactionbutton:1.3.0'
// Android standard libs
compile "com.android.support:appcompat-v7:${version_lib.appcompat}"
compile "com.android.support:design:${version_lib.appcompat}"
compile "com.android.support:support-v4:${version_lib.appcompat}"
compile "com.android.support:recyclerview-v7:${version_lib.appcompat}"
compile "com.android.support:palette-v7:${version_lib.appcompat}"

// UI libs
compile 'com.commonsware.cwac:anddown:0.4.0'
compile 'com.getbase:floatingactionbutton:1.10.1'
compile 'com.mobsandgeeks:adapter-kit:0.5.3'
compile 'commons-io:commons-io:2.4'
compile 'com.google.code.gson:gson:2.3.1'
compile 'com.jakewharton:butterknife:5.1.2'

// Tool libraries
compile "com.jakewharton:butterknife:${version_lib.butterknife}"
compile 'commons-io:commons-io:2.5'
compile 'com.google.code.gson:gson:2.8.1'

// Testing
testCompile 'junit:junit:4.12'
testCompile 'org.assertj:assertj-core:1.7.0'
testCompile 'org.mockito:mockito-all:1.8.4'
testCompile('org.robolectric:robolectric:3.0-rc2') {
testCompile 'org.assertj:assertj-core:3.8.0'
testCompile 'org.mockito:mockito-all:1.10.19'
testCompile('org.robolectric:robolectric:3.4.2') {
exclude group: 'commons-logging', module: 'commons-logging'
exclude group: 'org.apache.httpcomponents', module: 'httpclient'

}

// Processors
annotationProcessor "com.jakewharton:butterknife-compiler:${version_lib.butterknife}"
}
4 changes: 2 additions & 2 deletions app/src/main/java/me/writeily/AlphanumericPinActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.KeyEvent;
import android.widget.EditText;
Expand All @@ -17,7 +17,7 @@
/**
* Created by jeff on 2014-08-20.
*/
public class AlphanumericPinActivity extends ActionBarActivity {
public class AlphanumericPinActivity extends AppCompatActivity {

private Context context;
private String pin;
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/me/writeily/NoteActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.util.TypedValue;
import android.view.Menu;
Expand All @@ -37,7 +37,7 @@
/**
* Created by jeff on 2014-04-11.
*/
public class NoteActivity extends ActionBarActivity {
public class NoteActivity extends AppCompatActivity {

public static final String EMPTY_STRING = "";
private File note;
Expand Down Expand Up @@ -73,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
if (toolbar != null) {
setSupportActionBar(toolbar);
final Drawable upArrow = getResources().getDrawable(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
final Drawable upArrow = getResources().getDrawable(R.drawable.abc_ic_ab_back_material);
upArrow.setColorFilter(getResources().getColor(android.R.color.white), PorterDuff.Mode.SRC_ATOP);
getSupportActionBar().setHomeAsUpIndicator(upArrow);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/writeily/PinActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.TextWatcher;
Expand All @@ -18,7 +18,7 @@
/**
* Created by jeff on 2014-08-20.
*/
public class PinActivity extends ActionBarActivity {
public class PinActivity extends AppCompatActivity {

private Context context;
private String pin;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/writeily/PreviewActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import android.graphics.Picture;
import android.net.Uri;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -21,7 +21,7 @@
/**
* Created by jeff on 2014-04-13.
*/
public class PreviewActivity extends ActionBarActivity {
public class PreviewActivity extends AppCompatActivity {

private WebView previewWebView;
private String markdownRaw;
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/me/writeily/PromptPinActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@
import android.content.Intent;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;

/**
* Created by jeff on 2014-08-20.
*/
public class PromptPinActivity extends ActionBarActivity {
public class PromptPinActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand Down
Loading

0 comments on commit 12f5635

Please sign in to comment.