Move libraries into their own folder

and remove sharedTest symlink hack. The shared tests are now a proper gradle module to avoid issues with using the same source files in different modules.
kennytat · Sep 12, 2022 · f607584 · f607584
1 parent a6bce15
commit f607584
Show file tree

Hide file tree

Showing 181 changed files with 265 additions and 433 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -148,12 +148,12 @@ pages:
   only:
     - master
   script:
-    - ./gradlew :download:dokkaHtml :index:dokkaHtml :database:dokkaHtml
-    - mkdir public
-    - touch public/index.html
-    - cp -r download/build/dokka/html public/download
-    - cp -r index/build/dokka/html public/index
-    - cp -r database/build/dokka/html public/database
+    - ./gradlew :libs:download:dokkaHtml :libs:index:dokkaHtml :libs:database:dokkaHtml
+    - mkdir -p public/libs
+    - touch public/index.html public/libs/index.html
+    - cp -r libs/download/build/dokka/html public/libs/download
+    - cp -r libs/index/build/dokka/html public/libs/index
+    - cp -r libs/database/build/dokka/html public/libs/database
   artifacts:
     paths:
       - public
@@ -174,7 +174,7 @@ deploy_nightly:
     - echo "<item>${CI_PROJECT_PATH}-nightly</item>" >> app/src/main/res/values/default_repos.xml
     - echo "<item>${CI_PROJECT_URL}-nightly/raw/master/fdroid/repo</item>" >> app/src/main/res/values/default_repos.xml
     - cat config/nightly-repo/repo.xml >> app/src/main/res/values/default_repos.xml
-    - export DB=`sed -n 's,.*version *= *\([0-9][0-9]*\).*,\1,p' database/src/main/java/org/fdroid/database/FDroidDatabase.kt`
+    - export DB=`sed -n 's,.*version *= *\([0-9][0-9]*\).*,\1,p' libs/database/src/main/java/org/fdroid/database/FDroidDatabase.kt`
     - export versionCode=`printf '%d%05d' $DB $(date '+%s'| cut -b1-8)`
     - sed -i "s,^\(\s*versionCode\)  *[0-9].*,\1 $versionCode," app/build.gradle
     # build the APKs!

diff --git a/README.md b/README.md
@@ -20,10 +20,7 @@ from our site or [browse it in the repo](https://f-droid.org/app/org.fdroid.fdro
 Core F-Droid functionality is split into re-usable libraries
 to make using F-Droid technology in your own projects as easy as possible.
 
-Note that all libraries are still in alpha stage.
-While they work, their public APIs are still subject to change.
-
-* [download](download) library for handling (multi-platform) HTTP download of repository indexes and APKs
+[More information about libraries](libs/README.md)
 
 ## Contributing
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -142,7 +142,9 @@ android {
 }
 
 dependencies {
-    implementation project(":download")
+    implementation project(":libs:download")
+    implementation project(":libs:index")
+    implementation project(":libs:database")
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.preference:preference:1.1.1'
     implementation 'androidx.gridlayout:gridlayout:1.0.0'

diff --git a/download/README.md b/download/README.md
diff --git a/index/LICENSE b/index/LICENSE
diff --git a/index/README.md b/index/README.md
diff --git a/download/LICENSE → libs/LICENSE b/download/LICENSE → libs/LICENSE