-
Notifications
You must be signed in to change notification settings - Fork 0
Build env modernization #2
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
Changes from all commits
c02582c
37ed244
0536012
ae3957a
4b2fbf7
63f1f86
cc50be9
5b831a8
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,24 +1,20 @@ | ||
buildscript { | ||
repositories { | ||
mavenCentral() | ||
google() | ||
} | ||
|
||
dependencies { | ||
classpath 'com.android.tools.build:gradle:0.6.+' | ||
classpath 'com.android.tools.build:gradle:8.7.3' | ||
} | ||
} | ||
|
||
def isReleaseBuild() { | ||
return version.contains("SNAPSHOT") == false | ||
} | ||
|
||
allprojects { | ||
version = VERSION_NAME | ||
group = GROUP | ||
|
||
repositories { | ||
mavenCentral() | ||
google() | ||
} | ||
} | ||
|
||
apply plugin: 'android-reporting' |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,3 @@ | ||
VERSION_NAME=1.1.0 | ||
GROUP=se.emilsjolander | ||
|
||
POM_DESCRIPTION=android-FlipView is an easy to use android library for implementing flipping between views as seen in the popular Flipboard application | ||
POM_URL=https://github.com/emilsjolander/android-FlipView | ||
POM_SCM_URL=https://github.com/emilsjolander/android-FlipView | ||
POM_SCM_CONNECTION=scm:git:git://github.com/emilsjolander/android-FlipView.git | ||
POM_SCM_DEV_CONNECTION=scm:git:git://github.com/emilsjolander/android-FlipView.git | ||
POM_LICENCE_NAME=The Apache Software License, Version 2.0 | ||
POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt | ||
POM_LICENCE_DIST=repo | ||
POM_DEVELOPER_ID=emilsjolander | ||
POM_DEVELOPER_NAME=Emil Sjolander | ||
android.nonFinalResIds=false |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#Sat Nov 02 21:55:43 CET 2013 | ||
#Mon Mar 03 09:05:14 JST 2025 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-all.zip |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
jdk: | ||
- openjdk17 |
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,23 +1,52 @@ | ||
apply plugin: 'android-library' | ||
|
||
repositories { | ||
mavenCentral() | ||
} | ||
dependencies { | ||
compile 'com.android.support:support-v4:18.0.0' | ||
plugins { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Update build.gradle for modern Android Gradle Plugin. |
||
id 'com.android.library' | ||
id 'maven-publish' | ||
} | ||
|
||
android { | ||
compileSdkVersion 18 | ||
buildToolsVersion '18.1.1' | ||
|
||
sourceSets { | ||
main { | ||
manifest.srcFile 'AndroidManifest.xml' | ||
java.srcDirs = ['src'] | ||
res.srcDirs = ['res'] | ||
compileSdk 34 | ||
namespace 'se.emilsjolander.flipview' | ||
|
||
defaultConfig { | ||
minSdk 11 | ||
} | ||
|
||
buildTypes { | ||
debug { | ||
minifyEnabled false | ||
} | ||
release { | ||
minifyEnabled false | ||
} | ||
} | ||
|
||
publishing { | ||
// Publish as an AAB. | ||
singleVariant('release') | ||
} | ||
|
||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_17 | ||
targetCompatibility JavaVersion.VERSION_17 | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation 'com.android.support:support-v4:18.0.0' | ||
} | ||
|
||
apply from: '../maven_push.gradle' | ||
afterEvaluate { | ||
publishing { | ||
publications { | ||
release(MavenPublication) { | ||
groupId = GROUP | ||
artifactId = 'android-FlipView' | ||
version = VERSION_NAME | ||
|
||
afterEvaluate { | ||
from components.release | ||
} | ||
} | ||
} | ||
} | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<manifest> | ||
|
||
</manifest> |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -167,7 +167,7 @@ public FlipView(Context context, AttributeSet attrs, int defStyle) { | |
R.styleable.FlipView); | ||
|
||
// 0 is vertical, 1 is horizontal | ||
mIsFlippingVertically = a.getInt(R.styleable.FlipView_orientation, | ||
mIsFlippingVertically = a.getInt(R.styleable.FlipView_android_orientation, | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
VERTICAL_FLIP) == VERTICAL_FLIP; | ||
|
||
setOverFlipMode(OverFlipMode.values()[a.getInt( | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Move files for modern Android Gradle Plugin. |
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,10 +2,7 @@ | |
<resources> | ||
|
||
<declare-styleable name="FlipView"> | ||
<attr name="orientation" format="enum"> | ||
<enum name="vertical" value="0"/> | ||
<enum name="horizontal" value="1"/> | ||
</attr> | ||
<attr name="android:orientation" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
<attr name="overFlipMode" format="enum"> | ||
<enum name="glow" value="0"/> | ||
<enum name="rubber_band" value="1"/> | ||
|
This file was deleted.
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,22 +1,34 @@ | ||
apply plugin: 'android' | ||
|
||
repositories { | ||
mavenCentral() | ||
} | ||
dependencies { | ||
compile project(':library') | ||
compile 'com.android.support:support-v4:18.0.0' | ||
plugins { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Update build.gradle for modern Android Gradle Plugin. |
||
id 'com.android.application' | ||
} | ||
|
||
android { | ||
compileSdkVersion 18 | ||
buildToolsVersion '18.0.1' | ||
compileSdk 34 | ||
namespace 'se.emilsjolander.flipview.sample' | ||
|
||
sourceSets { | ||
main { | ||
manifest.srcFile 'AndroidManifest.xml' | ||
java.srcDirs = ['src'] | ||
res.srcDirs = ['res'] | ||
defaultConfig { | ||
applicationId 'se.emilsjolander.flipview.sample' | ||
versionCode 1 | ||
versionName "1.0" | ||
minSdk 11 | ||
} | ||
|
||
buildTypes { | ||
debug { | ||
minifyEnabled false | ||
} | ||
release { | ||
minifyEnabled false | ||
} | ||
} | ||
|
||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_17 | ||
targetCompatibility JavaVersion.VERSION_17 | ||
} | ||
} | ||
|
||
dependencies { | ||
implementation project(':library') | ||
implementation 'com.android.support:support-v4:18.0.0' | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I upgraded Gradle to build with the new OpenJDK.
The old OpenJDK does not support Apple Silicon, making development difficult.