Skip to content

Commit

Permalink
Merge pull request #2406 from owncloud/new_arch/get_public_shares_for…
Browse files Browse the repository at this point in the history
…_file

[New architecture] Get public shares for file
  • Loading branch information
davigonz authored Mar 15, 2019
2 parents ebda957 + 77415d9 commit 08a3398
Show file tree
Hide file tree
Showing 81 changed files with 7,091 additions and 4,023 deletions.
15 changes: 13 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,24 @@
buildscript {
ext.kotlin_version = '1.3.11'
ext {
// Libraries
kotlinVersion = '1.3.11'
archLifecycleVersion = '2.0.0'
roomVersion = '2.0.0'

// Testing
junitVersion = "4.12"
mockitoVersion = "2.24.0"
}

repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.3.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
}
}

Expand Down
2 changes: 1 addition & 1 deletion owncloud-android-library
Submodule owncloud-android-library updated 23 files
+8 −1 build.gradle
+10 −1 owncloudComLibrary/build.gradle
+31 −0 owncloudComLibrary/src/debug/java/com/owncloud/android/lib/testing/OpenForTesting.kt
+15 −11 owncloudComLibrary/src/main/java/com/owncloud/android/lib/common/utils/Log_OC.java
+0 −269 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.java
+187 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/CreateRemoteShareOperation.kt
+0 −124 ...loudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.java
+115 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/GetRemoteSharesForFileOperation.kt
+0 −356 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/OCShare.java
+201 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoteShare.kt
+0 −108 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.java
+98 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/RemoveRemoteShareOperation.kt
+3 −19 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareParserResult.kt
+21 −25 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/SharePermissionsBuilder.kt
+0 −140 ...dComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.java
+117 −0 ...oudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareToRemoteOperationResultParser.kt
+0 −452 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.java
+415 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/ShareXMLParser.kt
+0 −233 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.java
+196 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/shares/UpdateRemoteShareOperation.kt
+0 −199 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.java
+204 −0 owncloudComLibrary/src/main/java/com/owncloud/android/lib/resources/status/OwnCloudVersion.kt
+31 −0 owncloudComLibrary/src/release/java/com/owncloud/android/lib/testing/OpenForTesting.kt
49 changes: 44 additions & 5 deletions owncloudApp/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'

apply plugin: 'kotlin-allopen'

def commitSHA1 = 'COMMIT_SHA1'
def gitRemote = 'GIT_REMOTE'

dependencies {
/// dependencies for app building
implementation project(':owncloud-android-library:owncloudComLibrary')
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation "androidx.legacy:legacy-support-v4:$androidX"
implementation "androidx.annotation:annotation:1.0.1"
implementation 'com.google.android.material:material:1.0.0'
Expand All @@ -18,10 +21,14 @@ dependencies {
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "androidx.browser:browser:$androidX"
implementation 'commons-io:commons-io:2.6'
/// dependencies for local unit tests
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:2.19.0'
/// dependencies for instrumented tests

// Dependencies for unit tests
testImplementation "junit:junit:$junitVersion"
testImplementation "androidx.arch.core:core-testing:$archLifecycleVersion"
testImplementation "org.mockito:mockito-core:$mockitoVersion"

// Dependencies for instrumented tests
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
// JUnit4 Rules
androidTestImplementation 'androidx.test:rules:1.1.1'
androidTestImplementation 'androidx.test.ext:junit:1.1.0'
Expand All @@ -35,6 +42,11 @@ dependencies {
androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0'
// fix conflict in dependencies; see http://g.co/androidstudio/app-test-app-conflict for details
androidTestImplementation 'androidx.annotation:annotation:1.0.1'
androidTestImplementation "androidx.room:room-testing:$roomVersion"
androidTestImplementation "androidx.arch.core:core-testing:$archLifecycleVersion"
androidTestImplementation "org.mockito:mockito-android:$mockitoVersion"
androidTestImplementation "org.mockito:mockito-core:$mockitoVersion"

// Image loading
implementation('com.github.bumptech.glide:glide:4.6.1') {
exclude group: "com.android.support"
Expand All @@ -43,10 +55,23 @@ dependencies {
//Zooming Android ImageView.
implementation 'com.github.chrisbanes:PhotoView:2.1.4'

// WebDAV network library
implementation 'com.gitlab.ownclouders:dav4android:oc_support'

// Convert Java Objects into JSON and back
implementation 'com.google.code.gson:gson:2.8.5'

// Kotlin
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"

// Architecture lifecycle components
implementation "androidx.lifecycle:lifecycle-extensions:$archLifecycleVersion"
implementation "androidx.lifecycle:lifecycle-viewmodel:$archLifecycleVersion"
kapt "androidx.lifecycle:lifecycle-compiler:$archLifecycleVersion"

// Room
implementation "androidx.room:room-runtime:$roomVersion"
kapt "androidx.room:room-compiler:$roomVersion"
}

tasks.withType(Test) {
Expand All @@ -56,6 +81,11 @@ tasks.withType(Test) {
}
}

allOpen {
// allows mocking for classes w/o directly opening them for release builds
annotation 'com.owncloud.android.testing.OpenClass'
}

android {
compileSdkVersion 28

Expand Down Expand Up @@ -89,6 +119,11 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}

sourceSets {
androidTest.java.srcDirs += "src/test-common/java"
test.java.srcDirs += "src/test-common/java"
}

lintOptions {
abortOnError false
disable 'MissingTranslation'
Expand Down Expand Up @@ -130,6 +165,10 @@ android {
def appName = System.env.OC_APP_NAME
setOutputFileName(variant, appName, project)
}

testOptions {
unitTests.returnDefaultValues = true
}
}

// Updates output file names of a given variant to format
Expand Down
Loading

0 comments on commit 08a3398

Please sign in to comment.