Skip to content

Commit

Permalink
Merge pull request #606 from praveek/feature/uiservice
Browse files Browse the repository at this point in the history
Clean up gradle scripts and use AEP Gradle plugin
  • Loading branch information
praveek authored Feb 1, 2024
2 parents 57052bb + 724e446 commit 6385e16
Show file tree
Hide file tree
Showing 132 changed files with 719 additions and 3,649 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
version: 2.1

orbs:
android: circleci/[email protected]
android: circleci/android@2.4.0
codecov: codecov/[email protected]

jobs:
build-and-unit-test:
executor:
name: android/android-machine
name: android/android-docker
resource-class: large
tag: 2022.01.1
tag: 2024.01.1

steps:
- checkout
Expand Down Expand Up @@ -105,7 +105,7 @@ jobs:
executor:
name: android/android-machine
resource-class: large
tag: 2022.01.1
tag: 2024.01.1

steps:
- checkout
Expand All @@ -127,7 +127,7 @@ jobs:
executor:
name: android/android-machine
resource-class: large
tag: 2022.01.1
tag: 2024.01.1

steps:
- checkout
Expand Down
11 changes: 5 additions & 6 deletions .github/workflows/maven-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
with:
ref: main
- uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'zulu'
java-version: 17

- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down Expand Up @@ -66,7 +65,7 @@ jobs:
echo $GPG_SECRET_KEYS | base64 --decode | gpg --import --no-tty --batch --yes
echo $GPG_OWNERTRUST | base64 --decode | gpg --import-ownertrust --no-tty --batch --yes
- name: Publish to maven central repository
- name: Publish to Maven Central Repository
run: make ${{ github.event.inputs.extension }}-publish-main
env:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/maven-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,13 @@ jobs:
publish:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v3

- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v3
with:
java-version: 11
distribution: 'zulu'
java-version: 17

- name: Cache Gradle packages
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
steps:

- name: Checkout
uses: actions/checkout@v3.1.0
uses: actions/checkout@v3

- if: ${{ github.event.inputs.core-version != '' }}
name: Update Core Version
Expand Down
50 changes: 0 additions & 50 deletions code/build.gradle

This file was deleted.

19 changes: 19 additions & 0 deletions code/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
buildscript {
repositories {
gradlePluginPortal()
google()
mavenCentral()
maven { url = uri("https://jitpack.io") }
mavenLocal()
}


dependencies {
// Todo: Move away from specifying commit once we release a stable version."
classpath("com.github.adobe:aepsdk-commons:9deb721db7")
classpath("org.jetbrains.kotlinx:binary-compatibility-validator:0.13.2")
classpath("androidx.benchmark:benchmark-gradle-plugin:1.2.3")
}
}


28 changes: 0 additions & 28 deletions code/checkstyle.gradle

This file was deleted.

23 changes: 0 additions & 23 deletions code/checkstyle.xml

This file was deleted.

20 changes: 0 additions & 20 deletions code/codeformat.gradle

This file was deleted.

152 changes: 0 additions & 152 deletions code/core/build.gradle

This file was deleted.

Loading

0 comments on commit 6385e16

Please sign in to comment.