Merge pull request Crazyphil#15 from Crazyphil/version-update-test

Incremented version to 2.1
jamsilva · Feb 17, 2024 · d791e04 · d791e04
2 parents 25e187a + fd35ec4
commit d791e04
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Make Gradle wrapper executable
         run: chmod +x ./gradlew

diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml
@@ -25,7 +25,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: adopt
-          java-version: 11
+          java-version: 17
 
       - name: Make Gradle wrapper executable
         run: chmod +x ./gradlew

diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -30,9 +30,9 @@ android {
     defaultConfig {
         applicationId android.namespace
         minSdk 21
-        versionCode 3
-        versionName "2.0"
         targetSdk 34
+        versionCode 4
+        versionName "2.1"
     }
 
     buildTypes {

diff --git a/gradle.properties b/gradle.properties
@@ -20,6 +20,4 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
-android.defaults.buildfeatures.buildconfig=true
-android.nonFinalResIds=false
+android.nonTransitiveRClass=true