diff --git a/.github/workflows/android-publish.yml b/.github/workflows/android-publish.yml index f1b63e6a..e3057b06 100644 --- a/.github/workflows/android-publish.yml +++ b/.github/workflows/android-publish.yml @@ -13,11 +13,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' - name: Build with Gradle env: GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} diff --git a/.github/workflows/deps-publish.yml b/.github/workflows/deps-publish.yml index b170e21c..22084c7f 100644 --- a/.github/workflows/deps-publish.yml +++ b/.github/workflows/deps-publish.yml @@ -13,11 +13,12 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' - name: Build with Gradle env: GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }} diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ebeed71c..1024788c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,10 +9,11 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - name: set up JDK 1.8 - uses: actions/setup-java@v1 + - uses: actions/checkout@v2 + - name: set up JDK 11 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '11' - name: Build with Gradle run: cd application && ./gradlew build test -s --console=plain diff --git a/application/binary/src/main/AndroidManifest.xml b/application/binary/src/main/AndroidManifest.xml index 4a41d3b4..f6ad78b5 100644 --- a/application/binary/src/main/AndroidManifest.xml +++ b/application/binary/src/main/AndroidManifest.xml @@ -1,4 +1,2 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/application/build.gradle.kts b/application/build.gradle.kts index 44fb94cc..19c04451 100644 --- a/application/build.gradle.kts +++ b/application/build.gradle.kts @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.3") + classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5") classpath("com.google.firebase:firebase-crashlytics-gradle:2.5.0") } } @@ -21,7 +21,7 @@ androidProjectConfiguration( targetSdk = 29, compileSdk = 29, kotlinVersion = properties.getProperty("kotlinVersion", "1.4.21"), - agpVersion = properties.getProperty("agpVersion", "4.2.0-beta02"), + agpVersion = properties.getProperty("agpVersion", "7.0.0-beta04"), versionCode = 1, versionName = "1.0", dataBinding = true diff --git a/application/buildSrc/src/main/java/Test.kt b/application/buildSrc/src/main/java/Test.kt index 87f52e15..b7b1b592 100644 --- a/application/buildSrc/src/main/java/Test.kt +++ b/application/buildSrc/src/main/java/Test.kt @@ -23,8 +23,10 @@ object test { ) val ui = deps( + junit, junit_ext, - espresso + espresso, + "androidx.test:monitor:1.3.0".dep // Place here other UI-test deps ) } \ No newline at end of file diff --git a/application/gradle/wrapper/gradle-wrapper.properties b/application/gradle/wrapper/gradle-wrapper.properties index faa09dcc..69a97150 100644 --- a/application/gradle/wrapper/gradle-wrapper.properties +++ b/application/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-rc-3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/application/root-app/build.gradle.kts b/application/root-app/build.gradle.kts index fd89be99..8c3588cf 100644 --- a/application/root-app/build.gradle.kts +++ b/application/root-app/build.gradle.kts @@ -29,11 +29,9 @@ androidApp( project(":core:network:library"), project(":common:util") ), - testDependencies = deps( test.unit ), - androidTestDependencies = deps( test.ui ) diff --git a/application/root-app/src/androidTest/java/com/stepango/blockme/ExampleInstrumentedTest.kt b/application/root-app/src/androidTest/kotlin/com/stepango/blockme/ExampleInstrumentedTest.kt similarity index 100% rename from application/root-app/src/androidTest/java/com/stepango/blockme/ExampleInstrumentedTest.kt rename to application/root-app/src/androidTest/kotlin/com/stepango/blockme/ExampleInstrumentedTest.kt diff --git a/plugins/android/src/main/java/tools/forma/android/feature/AndroidLibrary.kt b/plugins/android/src/main/java/tools/forma/android/feature/AndroidLibrary.kt index ab66df7c..43b59ec1 100644 --- a/plugins/android/src/main/java/tools/forma/android/feature/AndroidLibrary.kt +++ b/plugins/android/src/main/java/tools/forma/android/feature/AndroidLibrary.kt @@ -2,13 +2,14 @@ package tools.forma.android.feature import androidJunitRunner import com.android.build.gradle.LibraryExtension +import org.gradle.api.Project +import org.gradle.kotlin.dsl.get import tools.forma.android.target.LibraryTargetTemplate import tools.forma.android.utils.BuildConfiguration import tools.forma.android.utils.applyFrom import tools.forma.validation.Validator import tools.forma.validation.validator import java.io.File -import org.gradle.api.Project class AndroidLibraryFeatureConfiguration( val packageName: String, @@ -30,7 +31,9 @@ fun androidLibraryFeatureDefinition( featureConfiguration = featureConfiguration, configuration = { extension, feature, project, formaConfiguration -> with(extension) { - maybeGenerateManifest(project, feature) + if (feature.generateManifest) { + maybeGenerateManifest(project, feature) + } compileSdkVersion(formaConfiguration.compileSdk) @@ -41,6 +44,10 @@ fun androidLibraryFeatureDefinition( feature.manifestPlaceholders ) + sourceSets["main"].java.srcDirs("src/main/kotlin") + sourceSets["test"].java.srcDirs("src/test/kotlin") + sourceSets["androidTest"].java.srcDirs("src/androidTest/kotlin") + buildTypes.applyFrom(feature.buildConfiguration) compileOptions.applyFrom(formaConfiguration) diff --git a/plugins/build.gradle.kts b/plugins/build.gradle.kts index 15710ac0..017d2e3a 100644 --- a/plugins/build.gradle.kts +++ b/plugins/build.gradle.kts @@ -6,7 +6,7 @@ plugins { subprojects { extra["kotlin_dep"] = "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21" - extra["agp_dep"] = "com.android.tools.build:gradle:4.1.1" + extra["agp_dep"] = "com.android.tools.build:gradle:7.0.0-beta04" repositories { google()