Merge branch 'orbot_16.6.2' into 'main'

image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"

variables:

  GIT_SUBMODULE_STRATEGY: recursive

stages:

- build

- .post

before_script:

- export GRADLE_USER_HOME=$(pwd)/.gradle

build:

  stage: build

  script:

  - ./gradlew assemble

  - ./gradlew :orbotservice:assembleRelease :privacymoduletor:assembleRelease

  artifacts:

    paths:

    - privacymodulesgoogle/build/outputs/aar

    - privacymoduletor/build/outputs/aar

    - orbotservice/build/outputs/aar

deploy:

  stage: .post

  script:

    - ./gradlew publish

  only:

    - main

[submodule "orbotservice"]

	path = orbotservice

	url = git@gitlab.e.foundation:e/os/orbotservice.git

[submodule "external/jtorctl"]

	path = external/jtorctl

	url = https://github.com/guardianproject/jtorctl

[submodule "external/badvpn"]

	path = external/badvpn

	url = https://github.com/guardianproject/badvpn.git

[submodule "external/jsocks"]

	path = external/jsocks

	url = https://github.com/guardianproject/jsocks.git

	url = ../orbotservice.git

This document explains how to properly build the module AAR for orbostservice and privacymoduletor from

source.

PrivacyModuleTor includes, in the external directory, git repo submodules of:

- OrbotService: the module used by Orbot to run Tor

- JTorControl: The Tor Control Library for Java

- BadVPN

- JSocks

Please install the following prerequisites (instructions for each follows):

- Android Software Development Kit or SDK (for Java code): http://developer.android.com/sdk/index.html *(Android Studio)*

- Android Native Development Kit or NDK (for C/C++ code) http://developer.android.com/sdk/ndk/index.html *(This can be installed through Android Studio's SDK Manager)*

PrivacyModuleTor includes git repo submodules of OrbotService, the module used by Orbot to run Tor

Be sure that you have all of the git submodules up-to-date:

	git submodule update --init --recursive

You then need to run "ndk-build" and the following commands to compile and prepare Orbot's native code:

UNIX:	

		cd orbotservice/src/main

		ndk-build (located in Android/Sdk/ndk/VERSION/)

Windows:

		cd orbotservice\src\main

		ndk-build.cmd (located in Android\Sdk\ndk\VERSION\) 

Now you can build the AAR modules :

You can build the AAR modules :

    ./gradlew :orbotservice:assembleRelease :privacymoduletor:assembleRelease

apply plugin: 'maven-publish'

buildscript {

    ext.kotlin_version = "1.6.0"

    apply from: './dependencies.gradle'

    ext.kotlin_version = "1.6.10"

    ext.orbot_version = "orbot-16.6.2"

    ext.advanced_privacy_version = "1.2.0"

    repositories {

        google()

        mavenCentral()

    dependencies {

        classpath 'com.android.tools.build:gradle:7.0.4'

        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong

        // in the individual module build.gradle files

    }

}

                groupId 'foundation.e'

                //You can either define these here or get them from project conf elsewhere

                artifactId 'orbotservice'

                version '0.2.1-orbot.16.4.1'

                version orbot_version

                artifact "$buildDir/outputs/aar/orbotservice-release.aar" //aar artifact you want to publish

                //generate pom nodes for dependencies

/*

    Applies across all modules

 */

android {

    compileSdkVersion 30

    buildToolsVersion '30.0.3'

    compileOptions {

        sourceCompatibility JavaVersion.VERSION_11

        targetCompatibility JavaVersion.VERSION_11

    }

}

 No newline at end of file