Skip to content

Commit 97e01d5

Browse files
Merge pull request #3 from Omega-R/develop
Added url support
2 parents 06f2e12 + 4b560b5 commit 97e01d5

30 files changed

Lines changed: 598 additions & 70 deletions

File tree

634 Bytes
Binary file not shown.

.idea/codeStyles/Project.xml

Lines changed: 29 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/dictionaries/R12.xml

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/encodings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 20 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 38 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
targetSdkVersion rootProject.ext.targetSdkVersion
1111
versionCode 1
1212
versionName "1.0"
13-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1414
}
1515
buildTypes {
1616
release {
@@ -23,12 +23,12 @@ android {
2323
dependencies {
2424
implementation fileTree(dir: 'libs', include: ['*.jar'])
2525
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
26-
implementation "com.android.support:appcompat-v7:$supportVersion"
27-
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
26+
implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
2827

2928
api project(':omegatypes')
29+
api project(':picasso')
3030

3131
testImplementation 'junit:junit:4.12'
32-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
33-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
32+
androidTestImplementation 'androidx.test:runner:1.1.1'
33+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
3434
}

app/src/androidTest/java/omega_r/com/omegatypesexample/ExampleInstrumentedTest.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package omega_r.com.omegatypesexample
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.InstrumentationRegistry
4+
import androidx.test.runner.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="omega_r.com.omegatypesexample">
44

5+
<uses-permission android:name="android.permission.INTERNET"/>
6+
7+
58
<application
69
android:allowBackup="true"
710
android:icon="@mipmap/ic_launcher"

0 commit comments

Comments
 (0)