Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

remove Eclipse structure #180

Merged
merged 5 commits into from
Dec 14, 2018
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions .project

This file was deleted.

4 changes: 0 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs

This file was deleted.

2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ branches:
- master
install:
# Let's use the new command 'sdkmanager' to install Android SDK components
- yes | sdkmanager --verbose "build-tools;26.0.2"
- yes | sdkmanager --verbose "build-tools;26.0.3"
- yes | sdkmanager --verbose "platform-tools"
- yes | sdkmanager --verbose "tools"
- yes | sdkmanager --verbose "platforms;android-26"
Expand Down
8 changes: 0 additions & 8 deletions ant.properties

This file was deleted.

50 changes: 1 addition & 49 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,17 @@ buildscript {
repositories {
google()
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
}
}

apply plugin: 'com.android.library'

allprojects {
repositories {
google()
jcenter()
maven { url 'https://jitpack.io' }
}
}

dependencies {
api 'com.squareup.okhttp3:okhttp:3.10.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.2.51"
implementation 'com.gitlab.ownclouders:dav4android:oc_support'
}

android {
compileSdkVersion 26

defaultConfig {
minSdkVersion 14
targetSdkVersion 26
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}

// Move the tests to tests/java, tests/res, etc...
androidTest.setRoot('tests')

// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would
// conflict with src/ being used by the main source set.
// Adding new build types or product flavors should be accompanied
// by a similar customization.
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}

lintOptions {
abortOnError false
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
92 changes: 0 additions & 92 deletions build.xml

This file was deleted.

7 changes: 0 additions & 7 deletions custom_rules.xml

This file was deleted.

26 changes: 26 additions & 0 deletions owncloud-android-library/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
apply plugin: 'com.android.library'

dependencies {
api 'com.squareup.okhttp3:okhttp:3.12.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.11"
implementation 'com.gitlab.ownclouders:dav4android:oc_support'
}

android {
compileSdkVersion 28

defaultConfig {
minSdkVersion 14
targetSdkVersion 28
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Upgrading the sdk version is not always a trivial task and we do it carefully, with a specific issue to test everything and ensure nothing is broken, so I would keep 26 in compileSdkVersion and targetSdkVersion here and in sample client. Android P migration will be faced separately in owncloud/android#2283

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It violets my principe "never go back" and don't introduce Lint warnings intentionally
image

But I want to do the shit done, so it's 26 again

}

lintOptions {
abortOnError false
ignoreWarnings true
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,12 @@

<!-- USE_CREDENTIALS, MANAGE_ACCOUNTS and AUTHENTICATE_ACCOUNTS are needed for API < 23.
In API >= 23 the do not exist anymore -->
<uses-permission
android:name="android.permission.MANAGE_ACCOUNTS"
android:maxSdkVersion="22" />
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.AUTHENTICATE_ACCOUNTS" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

</manifest>

Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public Account getFailedAccount() {
public static class Constants {
/**
* Version should be 3 numbers separated by dot so it can be parsed by
* {@link com.owncloud.android.lib.resources.status.OwnCloudVersion}
* {@link OwnCloudVersion}
*/
public static final String KEY_OC_VERSION = "oc_version";
/**
Expand Down
15 changes: 0 additions & 15 deletions project.properties

This file was deleted.

9 changes: 0 additions & 9 deletions sample_client/.classpath

This file was deleted.

33 changes: 0 additions & 33 deletions sample_client/.project

This file was deleted.

4 changes: 0 additions & 4 deletions sample_client/.settings/org.eclipse.jdt.core.prefs

This file was deleted.

17 changes: 0 additions & 17 deletions sample_client/ant.properties

This file was deleted.

Loading