Skip to content

Commit 5c99bc0

Browse files
authored
Merge pull request #2 from StephanHener/rx2
Rx2
2 parents f9c7293 + ef0f024 commit 5c99bc0

23 files changed

Lines changed: 80 additions & 269 deletions

File tree

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.0.6'
4+
ext.kotlin_version = '1.1.4-2'
55
repositories {
66
jcenter()
77
}
88
dependencies {
9-
classpath 'com.android.tools.build:gradle:2.3.0-beta2'
9+
classpath 'com.android.tools.build:gradle:3.0.0-beta2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111

1212
// NOTE: Do not place your application dependencies here; they belong
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Tue Jan 31 13:18:29 CET 2017
1+
#Thu Aug 24 12:46:39 CEST 2017
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip

orxo-sample/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

orxo-sample/build.gradle

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

orxo-sample/proguard-rules.pro

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

orxo-sample/src/androidTest/java/com/stephanhener/android/orxo/ExampleInstrumentedTest.java

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

orxo-sample/src/main/AndroidManifest.xml

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

orxo-sample/src/main/java/com/stephanhener/android/orxo/OrxoTestActivity.java

Lines changed: 0 additions & 12 deletions
This file was deleted.
-3.34 KB
Binary file not shown.
-2.15 KB
Binary file not shown.

0 commit comments

Comments
 (0)