erik/TESRemoteProgrammer
erik/TESRemoteProgrammer
1
0
Fork 0
Code Issues Pull requests Releases Activity

Fix to Travis and Circle CIs.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-10-27 13:05:21 -07:00
parent 59bed44817
commit 8ecb957819
5 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml generated
View file

@ -24,7 +24,7 @@
</value> </value>
</option> </option>
</component> </component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" /> <output url="file://$PROJECT_DIR$/build/classes" />
</component> </component>
<component name="ProjectType"> <component name="ProjectType">

2
.travis.yml
View file

@ -16,7 +16,7 @@ android:
components: components:
- tools - tools
- platform-tools - platform-tools
- build-tools-26.0.1 - build-tools-26.0.2
- android-26 - android-26
- extra-google-m2repository - extra-google-m2repository
- extra-android-m2repository - extra-android-m2repository

40
app/build.gradle
View file

@ -27,46 +27,46 @@ android {
} }
dependencies { dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12' testImplementation 'junit:junit:4.12'
compile 'com.android.support:support-v13:26.1.0' implementation 'com.android.support:support-v13:26.1.0'
compile 'com.android.support:appcompat-v7:26.1.0' implementation 'com.android.support:appcompat-v7:26.1.0'
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
compile 'org.jetbrains.anko:anko-sdk23:0.10.2' implementation 'org.jetbrains.anko:anko-sdk23:0.10.2'
compile 'org.jetbrains.anko:anko-appcompat-v7:0.10.2' implementation 'org.jetbrains.anko:anko-appcompat-v7:0.10.2'
compile 'org.jetbrains.anko:anko-support-v4:0.10.2' implementation 'org.jetbrains.anko:anko-support-v4:0.10.2'
compile 'org.jetbrains.anko:anko-design:0.10.2' implementation 'org.jetbrains.anko:anko-design:0.10.2'
compile 'com.android.support:design:26.1.0' implementation 'com.android.support:design:26.1.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.2' implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.2'
// https://github.com/JakeWharton/ViewPagerIndicator // https://github.com/JakeWharton/ViewPagerIndicator
compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar' implementation 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
// https://github.com/AndroidDeveloperLB/AutoFitTextView // https://github.com/AndroidDeveloperLB/AutoFitTextView
compile 'com.github.AndroidDeveloperLB:AutoFitTextView:4' implementation 'com.github.AndroidDeveloperLB:AutoFitTextView:4'
// https://github.com/hotchemi/PermissionsDispatcher // https://github.com/hotchemi/PermissionsDispatcher
compile 'com.github.hotchemi:permissionsdispatcher:3.0.1' implementation 'com.github.hotchemi:permissionsdispatcher:3.0.1'
kapt 'com.github.hotchemi:permissionsdispatcher-processor:3.0.1' kapt 'com.github.hotchemi:permissionsdispatcher-processor:3.0.1'
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
// https://github.com/eggheadgames/android-about-box // https://github.com/eggheadgames/android-about-box
compile 'com.github.eggheadgames:android-about-box:1.3.1' implementation 'com.github.eggheadgames:android-about-box:1.3.1'
//compile(name: 'library-debug', ext: 'aar') //compile(name: 'library-debug', ext: 'aar')
//compile 'com.github.daniel-stoneuk:material-about-library:2.2.1' //compile 'com.github.daniel-stoneuk:material-about-library:2.2.1'
compile 'com.android.support:animated-vector-drawable:26.1.0' implementation 'com.android.support:animated-vector-drawable:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0' implementation 'com.android.support:cardview-v7:26.1.0'
// https://github.com/ACRA/acra // https://github.com/ACRA/acra
compile 'ch.acra:acra:4.9.2' implementation 'ch.acra:acra:4.9.2'
} }
repositories { repositories {
mavenCentral() mavenCentral()
google()
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
} }
kapt { kapt {

1
build.gradle
View file

@ -4,6 +4,7 @@ buildscript {
ext.kotlin_version = '1.1.51' ext.kotlin_version = '1.1.51'
repositories { repositories {
jcenter() jcenter()
google()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.0.0' classpath 'com.android.tools.build:gradle:3.0.0'

2
circle.yml
View file

@ -9,7 +9,7 @@ machine:
dependencies: dependencies:
override: override:
- chmod +x gradlew - chmod +x gradlew
- echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-26.0.1,android-26,extra-google-m2repository,extra-android-m2repository,extra-android-support - echo y | android update sdk --no-ui --all --filter tools,platform-tools,build-tools-26.0.2,android-26,extra-google-m2repository,extra-android-m2repository,extra-android-support
- ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies - ANDROID_HOME=/usr/local/android-sdk-linux ./gradlew dependencies
test: test: