Skip to content

Commit

Permalink
Updated to JDK 8
Browse files Browse the repository at this point in the history
  • Loading branch information
aliumujib committed May 21, 2018
1 parent beac606 commit b471dd5
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

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

9 changes: 5 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.1'
Expand Down Expand Up @@ -40,13 +41,13 @@ task clean(type: Delete) {

ext {
// sdk and tools
compileSdkVersion = 26
compileSdkVersion = 27
minSdkVersion = 16
targetSdkVersion = 26
buildToolsVersion = '26.0.2'
targetSdkVersion = 27
buildToolsVersion = '27.0.3'

// libs versions
supportVersion = '26.1.0'
supportVersion = '27.0.0'
junitVersion = '4.12'
mockitoVersion = '1.10.19'
hamcrestVersion = '1.3'
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu May 03 13:41:01 WAT 2018
#Mon May 07 08:25:44 WAT 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.3-all.zip
9 changes: 6 additions & 3 deletions nibo_library/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'com.android.library'


apply plugin: 'com.github.dcendents.android-maven'
group='com.github.aliumujib'

repositories {
Expand Down Expand Up @@ -48,7 +47,11 @@ android {
exclude 'META-INF/LGPL2.1'
}

//RxPlaceAutoCompleteSearchBar
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

}

dependencies {
Expand Down
11 changes: 8 additions & 3 deletions niboexample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}

dependencies {
Expand All @@ -31,8 +36,8 @@ dependencies {
//compile 'com.github.aliumujib:Nibo:v1.01'

compile project(':nibo_library')
compile 'com.android.support:appcompat-v7:26.+'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:design:26.+'
compile "com.android.support:appcompat-v7:$rootProject.ext.supportVersion"
compile "com.android.support.constraint:constraint-layout:1.0.2"
compile "com.android.support:design:$rootProject.ext.supportVersion"
testCompile 'junit:junit:4.12'
}

0 comments on commit b471dd5

Please sign in to comment.