Skip to content

Commit d4d9175

Browse files
committed
Restructure modules.
1 parent f4ae190 commit d4d9175

File tree

2,405 files changed

+42
-46
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,405 files changed

+42
-46
lines changed

.github/workflows/check.yml

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: ./update-submodules
4242

4343
- name: Generate Stone
44-
run: ./gradlew :dropbox-sdk-java:generateStone
44+
run: ./gradlew :core:generateStone
4545

4646
- name: Ensure no changes in Generated Code
4747
run: ./scripts/check-clean-git-status
@@ -54,7 +54,7 @@ jobs:
5454
run: ./generate-ci-auth-file
5555

5656
- name: Ensure Binary Compatibility
57-
run: ./gradlew :dropbox-sdk-java:apiCheck
57+
run: ./gradlew :core:apiCheck :android:apiCheck
5858

5959
- name: Dependency Guard
6060
run: ./gradlew dependencyGuard
@@ -130,18 +130,21 @@ jobs:
130130
with:
131131
name: TestReports
132132
path: |
133-
dropbox-sdk-java/build/reports/
133+
core/build/reports/
134+
android/build/reports/
134135
135136
- name: Upload JavaDocs
136137
uses: actions/upload-artifact@v3
137138
with:
138139
name: JavaDocs
139140
path: |
140-
dropbox-sdk-java/build/docs/javadoc/
141+
core/build/docs/javadoc/
142+
android/build/docs/javadoc/
141143
142144
- name: Upload Build Artifacts
143145
uses: actions/upload-artifact@v3
144146
with:
145147
name: BuildArtifacts
146148
path: |
147-
dropbox-sdk-java/build/distributions/
149+
core/build/distributions/
150+
android/build/distributions/

.gitmodules

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "dropbox-sdk-java/src/main/stone"]
2-
path = dropbox-sdk-java/src/main/stone
1+
[submodule "core/src/main/stone"]
2+
path = core/src/main/stone
33
url = https://github.com/dropbox/dropbox-api-spec.git
4-
[submodule "dropbox-sdk-java/stone"]
5-
path = dropbox-sdk-java/stone
4+
[submodule "core/stone"]
5+
path = core/stone
66
url = https://github.com/dropbox/stone.git

README.md

Lines changed: 1 addition & 1 deletion
File renamed without changes.
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
2+
id 'com.android.library'
3+
id 'org.jetbrains.kotlin.android'
24
id "org.jetbrains.kotlinx.binary-compatibility-validator"
35
alias(dropboxJavaSdkLibs.plugins.maven.publish.plugin)
46
alias(dropboxJavaSdkLibs.plugins.gradle.version.plugin)
5-
id 'com.android.library'
6-
id 'org.jetbrains.kotlin.android'
77
alias(dropboxJavaSdkLibs.plugins.dependency.guard)
88
}
99

@@ -20,7 +20,7 @@ android {
2020
}
2121

2222
dependencies {
23-
api(project(path: ":dropbox-sdk-java", configuration: "withoutOsgi"))
23+
api(project(path: ":core", configuration: "withoutOsgi"))
2424
}
2525

2626
dependencyGuard {

dropbox-sdk-android/dependencies/releaseRuntimeClasspath.txt renamed to android/dependencies/releaseRuntimeClasspath.txt

File renamed without changes.

android/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_ARTIFACT_ID = dropbox-android-sdk
2+
POM_NAME = Dropbox SDK for Android
3+
POM_DESCRIPTION = An Android client library to access Dropbox's HTTP-based Core API v2.
File renamed without changes.

dropbox-sdk-android/src/main/java/com/dropbox/core/android/Auth.kt renamed to android/src/main/java/com/dropbox/core/android/Auth.kt

File renamed without changes.

0 commit comments

Comments
 (0)