Skip to content

Commit fe5cde9

Browse files
author
Bootpay
committed
fix dependency compling
1 parent 3befe46 commit fe5cde9

File tree

2,193 files changed

+4446
-5733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,193 files changed

+4446
-5733
lines changed

bootpay/bootpay.iml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
<option name="jvmTarget" value="1.8" />
3434
<option name="addCompilerBuiltIns" value="true" />
3535
<option name="loadBuiltInsFromDependencies" value="true" />
36-
<option name="languageVersion" value="1.1" />
37-
<option name="apiVersion" value="1.1" />
36+
<option name="languageVersion" value="1.2" />
37+
<option name="apiVersion" value="1.2" />
3838
<option name="pluginOptions">
3939
<array />
4040
</option>
@@ -131,11 +131,11 @@
131131
<orderEntry type="jdk" jdkName="Android API 25 Platform (3)" jdkType="Android SDK" />
132132
<orderEntry type="sourceFolder" forTests="false" />
133133
<orderEntry type="library" name="com.squareup.retrofit2:converter-gson:2.3.0@jar" level="project" />
134-
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.1.4@jar" level="project" />
135134
<orderEntry type="library" scope="TEST" name="com.android.support.test:exposed-instrumentation-api-publish-0.5" level="project" />
136135
<orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
137136
<orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
138137
<orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
138+
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib:1.2.10@jar" level="project" />
139139
<orderEntry type="library" name="com.android.support:support-core-ui-25.3.1" level="project" />
140140
<orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
141141
<orderEntry type="library" name="com.android.support:support-compat-25.3.1" level="project" />
@@ -147,23 +147,23 @@
147147
<orderEntry type="library" name="com.android.support:support-media-compat-25.3.1" level="project" />
148148
<orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
149149
<orderEntry type="library" name="com.squareup.moshi:moshi:1.4.0@jar" level="project" />
150+
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.10@jar" level="project" />
150151
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
151152
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-2.2.2" level="project" />
152153
<orderEntry type="library" name="com.android.support:animated-vector-drawable-25.3.1" level="project" />
153154
<orderEntry type="library" name="com.squareup.retrofit2:adapter-rxjava:2.3.0@jar" level="project" />
154155
<orderEntry type="library" scope="TEST" name="com.android.support.test:rules-0.5" level="project" />
156+
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.9.1@jar" level="project" />
155157
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
156158
<orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
157159
<orderEntry type="library" scope="TEST" name="com.android.support.test:runner-0.5" level="project" />
158160
<orderEntry type="library" name="com.android.support:appcompat-v7-25.3.1" level="project" />
159-
<orderEntry type="library" name="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.4@jar" level="project" />
160161
<orderEntry type="library" name="com.chibatching.kotpref:kotpref-2.2.0" level="project" />
161162
<orderEntry type="library" name="org.jetbrains:annotations:13.0@jar" level="project" />
162163
<orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-2.2.2" level="project" />
163164
<orderEntry type="library" scope="TEST" name="javax.annotation:javax.annotation-api:1.2@jar" level="project" />
164165
<orderEntry type="library" name="io.reactivex:rxjava:1.3.0@jar" level="project" />
165166
<orderEntry type="library" name="com.squareup.retrofit2:converter-moshi:2.3.0@jar" level="project" />
166-
<orderEntry type="library" name="com.squareup.okhttp3:okhttp:3.9.0@jar" level="project" />
167167
<orderEntry type="library" name="com.android.support:support-vector-drawable-25.3.1" level="project" />
168168
<orderEntry type="library" name="com.android.support:support-annotations:25.3.1@jar" level="project" />
169169
</component>

bootpay/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
23+
implementation fileTree(dir: 'libs', include: ['*.jar'])
2424
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
2525
exclude group: 'com.android.support', module: 'support-annotations'
2626
})
27-
compile 'com.google.code.gson:gson:2.8.0'
28-
compile 'com.squareup.retrofit2:retrofit:2.3.0'
29-
compile 'com.squareup.retrofit2:converter-gson:2.3.0'
30-
compile 'com.squareup.retrofit2:converter-moshi:2.3.0'
31-
compile 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
32-
compile 'com.squareup.okhttp3:okhttp:3.9.0'
33-
compile 'com.android.support:appcompat-v7:25.3.1'
34-
compile "com.chibatching.kotpref:kotpref:2.2.0"
27+
implementation 'com.google.code.gson:gson:2.8.0'
28+
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
29+
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
30+
implementation 'com.squareup.retrofit2:converter-moshi:2.3.0'
31+
implementation 'com.squareup.retrofit2:adapter-rxjava:2.3.0'
32+
implementation 'com.squareup.okhttp3:okhttp:3.9.1'
33+
implementation 'com.android.support:appcompat-v7:25.3.1'
34+
implementation "com.chibatching.kotpref:kotpref:2.2.0"
3535
// compile 'com.scottyab:secure-preferences-lib:0.1.4'
36-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
36+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:1.2.10"
3737
}
3838
repositories {
3939
mavenCentral()

0 commit comments

Comments
 (0)