diff --git a/.github/workflows/publish_release.yml b/.github/workflows/publish_release.yml index f8624cf..b3e0234 100644 --- a/.github/workflows/publish_release.yml +++ b/.github/workflows/publish_release.yml @@ -13,10 +13,11 @@ jobs: - uses: actions/setup-ruby@v1 with: ruby-version: '2.6' - - name: Set up JDK 1.11 - uses: actions/setup-java@v1 + - name: set up JDK + uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: 'zulu' + java-version: '11' - name: Build & run unit tests shell: bash run: ./gradlew --continue build testRelease diff --git a/.github/workflows/publish_snapshot.yml b/.github/workflows/publish_snapshot.yml index f8714e5..e68f595 100644 --- a/.github/workflows/publish_snapshot.yml +++ b/.github/workflows/publish_snapshot.yml @@ -10,10 +10,11 @@ jobs: runs-on: [ ubuntu-latest ] steps: - uses: actions/checkout@v1 - - name: Set up JDK 1.11 - uses: actions/setup-java@v1 + - name: set up JDK + uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: 'zulu' + java-version: '11' - name: Run unit tests shell: bash run: ./gradlew --continue build testRelease diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index bf94fb6..cddc4bb 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -12,10 +12,11 @@ jobs: - uses: actions/setup-ruby@v1 with: ruby-version: '2.6' - - name: set up JDK 1.11 - uses: actions/setup-java@v1 + - name: set up JDK + uses: actions/setup-java@v2 with: - java-version: 1.11 + distribution: 'zulu' + java-version: '11' - name: Run Lint Check shell: bash run: ./gradlew lintCheck diff --git a/buildSrc/src/main/kotlin/ProjectSettings.kt b/buildSrc/src/main/kotlin/ProjectSettings.kt index eb4031a..cc3d11d 100644 --- a/buildSrc/src/main/kotlin/ProjectSettings.kt +++ b/buildSrc/src/main/kotlin/ProjectSettings.kt @@ -1,8 +1,7 @@ object ProjectSettings { const val applicationId = "app.futured.donut" - const val targetSdk = 29 + const val targetSdk = 31 const val minSdkLibrary = 19 const val minSdkLibraryCompose = 21 const val minSdkSample = 21 - const val minSdk = 21 } diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt index 285b027..e2ecc09 100644 --- a/buildSrc/src/main/kotlin/Versions.kt +++ b/buildSrc/src/main/kotlin/Versions.kt @@ -1,9 +1,9 @@ object Versions { // gradle - const val gradle = "7.0.0-alpha12" + const val gradle = "7.0.3" // kotlin - const val kotlin = "1.4.32" + const val kotlin = "1.5.31" // plugins const val detekt = "1.4.0" @@ -13,10 +13,10 @@ object Versions { const val dokka = "1.4.20" // androidx - const val appCompat = "1.3.0-beta01" + const val appCompat = "1.3.1" const val constraintLayout = "1.1.3" const val ktx = "1.1.0" // Jetpack Compose - const val jetpackCompose = "1.0.0-beta04" + const val jetpackCompose = "1.0.4" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 9fccb7a..5416585 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip diff --git a/library-compose/build.gradle.kts b/library-compose/build.gradle.kts index 757b3aa..82e26c3 100644 --- a/library-compose/build.gradle.kts +++ b/library-compose/build.gradle.kts @@ -7,11 +7,11 @@ plugins { } android { - compileSdkVersion(ProjectSettings.targetSdk) + compileSdk = ProjectSettings.targetSdk defaultConfig { - minSdkVersion(ProjectSettings.minSdkLibraryCompose) - targetSdkVersion(ProjectSettings.targetSdk) + minSdk = ProjectSettings.minSdkLibraryCompose + targetSdk = ProjectSettings.targetSdk } sourceSets { diff --git a/library/build.gradle.kts b/library/build.gradle.kts index 737adf7..c6cafdb 100644 --- a/library/build.gradle.kts +++ b/library/build.gradle.kts @@ -7,11 +7,11 @@ plugins { } android { - compileSdkVersion(ProjectSettings.targetSdk) + compileSdk = ProjectSettings.targetSdk defaultConfig { - minSdkVersion(ProjectSettings.minSdkLibrary) - targetSdkVersion(ProjectSettings.targetSdk) + minSdk = ProjectSettings.minSdkLibrary + targetSdk = ProjectSettings.targetSdk } sourceSets { diff --git a/sample/build.gradle.kts b/sample/build.gradle.kts index 21d26eb..f208767 100644 --- a/sample/build.gradle.kts +++ b/sample/build.gradle.kts @@ -6,12 +6,12 @@ plugins { } android { - compileSdkVersion(ProjectSettings.targetSdk) + compileSdk = ProjectSettings.targetSdk defaultConfig { applicationId = ProjectSettings.applicationId - minSdkVersion(ProjectSettings.minSdk) - targetSdkVersion(ProjectSettings.targetSdk) + minSdk = ProjectSettings.minSdkSample + targetSdk = ProjectSettings.targetSdk versionCode = 1 } diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml index 284d11f..de44813 100644 --- a/sample/src/main/AndroidManifest.xml +++ b/sample/src/main/AndroidManifest.xml @@ -1,5 +1,6 @@ + android:exported="true" + android:screenOrientation="portrait" + tools:ignore="LockedOrientationActivity"> - - + + - + - + - +